-
Notifications
You must be signed in to change notification settings - Fork 6.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refocus on previously selected tab for GTS
This CL does the following: 1. Fixes the issue of GTS hiding when undoing a single and all tab closure action. 2. Adds functionality of refocusing on previously selected tab when tab closure is undone from GTS. 3. Refactors the existing refocus code by extracting the logic specific to it into its own helper file. 4. Refocus on previously selected tab when undoing a single and all tab closure action on mobile. Demo: Phone: https://drive.google.com/file/d/13cn1WD07yhHNlqF7LNcNQKIU8aJUQql0/view?usp=sharing Tablet: https://drive.google.com/file/d/1CRaeNfpAkglxI_yfVxVUzPH1Atv3jDmN/view?usp=sharing Bug: 1316413 Change-Id: I7a6c7da8c9d4bc081d32d5cf9ee8dacf0aac2c10 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3594345 Reviewed-by: Theresa Sullivan <twellington@chromium.org> Commit-Queue: Gaurav Jayasawal <gauravjj@google.com> Reviewed-by: Robert Kaplow <rkaplow@chromium.org> Reviewed-by: Sirisha Kavuluru <skavuluru@google.com> Cr-Commit-Position: refs/heads/main@{#1002117}
- Loading branch information
Gaurav Jayasawal
authored and
Chromium LUCI CQ
committed
May 11, 2022
1 parent
f61ad36
commit d0e0946
Showing
26 changed files
with
770 additions
and
368 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
246 changes: 246 additions & 0 deletions
246
chrome/android/java/src/org/chromium/chrome/browser/UndoRefocusHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,246 @@ | ||
| // Copyright 2022 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| package org.chromium.chrome.browser; | ||
|
|
||
| import androidx.annotation.VisibleForTesting; | ||
|
|
||
| import org.chromium.base.Callback; | ||
| import org.chromium.base.metrics.RecordUserAction; | ||
| import org.chromium.base.supplier.ObservableSupplier; | ||
| import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl; | ||
| import org.chromium.chrome.browser.flags.CachedFeatureFlags; | ||
| import org.chromium.chrome.browser.flags.ChromeFeatureList; | ||
| import org.chromium.chrome.browser.layouts.LayoutStateProvider; | ||
| import org.chromium.chrome.browser.layouts.LayoutType; | ||
| import org.chromium.chrome.browser.lifecycle.DestroyObserver; | ||
| import org.chromium.chrome.browser.tab.Tab; | ||
| import org.chromium.chrome.browser.tab.TabSelectionType; | ||
| import org.chromium.chrome.browser.tabmodel.TabModel; | ||
| import org.chromium.chrome.browser.tabmodel.TabModelSelector; | ||
| import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabModelObserver; | ||
| import org.chromium.chrome.browser.tabmodel.TabModelUtils; | ||
|
|
||
| import java.util.HashSet; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * Refocus on previously selected tab if the selected tab closure was undone. | ||
| */ | ||
| public class UndoRefocusHelper implements DestroyObserver { | ||
| private final Set<Integer> mTabsClosedFromTabStrip; | ||
| private final TabModelSelector mModelSelector; | ||
| private final ObservableSupplier<LayoutManagerImpl> mLayoutManagerObservableSupplier; | ||
|
|
||
| private LayoutManagerImpl mLayoutManager; | ||
| private LayoutStateProvider.LayoutStateObserver mLayoutStateObserver; | ||
| private TabModelSelectorTabModelObserver mTabModelSelectorTabModelObserver; | ||
| private Integer mSelectedTabIdWhenTabClosed; | ||
| private Boolean mClosedAllTabs; | ||
| private boolean mTabSwitcherActive; | ||
| private Callback<LayoutManagerImpl> mLayoutManagerSupplierCallback; | ||
| private boolean mIsTablet; | ||
|
|
||
| /** | ||
| * This method is used to create and initialize the UndoRefocusHelper. | ||
| * @param modelSelector TabModelSelector used to subscribe to TabModelSelectorTabModelObserver | ||
| * to capture when tabs are being closed or the closure is being undone. | ||
| * @param layoutManagerObservableSupplier This supplies the LayoutManager implementation to | ||
| * observe the layout state when it's available. | ||
| * @param isTablet Whether the current device is a tablet. | ||
| */ | ||
| public static void initialize(TabModelSelector modelSelector, | ||
| ObservableSupplier<LayoutManagerImpl> layoutManagerObservableSupplier, | ||
| boolean isTablet) { | ||
| if (!CachedFeatureFlags.isEnabled(ChromeFeatureList.TAB_STRIP_IMPROVEMENTS)) return; | ||
|
|
||
| new UndoRefocusHelper(modelSelector, layoutManagerObservableSupplier, isTablet); | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| protected UndoRefocusHelper(TabModelSelector modelSelector, | ||
| ObservableSupplier<LayoutManagerImpl> layoutManagerObservableSupplier, | ||
| boolean isTablet) { | ||
| mLayoutManagerObservableSupplier = layoutManagerObservableSupplier; | ||
| mModelSelector = modelSelector; | ||
| mTabsClosedFromTabStrip = new HashSet<>(); | ||
| mTabSwitcherActive = false; | ||
| mIsTablet = isTablet; | ||
|
|
||
| observeTabModel(); | ||
| observeLayoutState(); | ||
| } | ||
|
|
||
| @Override | ||
| public void onDestroy() { | ||
| mTabModelSelectorTabModelObserver.destroy(); | ||
| mLayoutManagerObservableSupplier.removeObserver(mLayoutManagerSupplierCallback); | ||
| mLayoutManager.removeObserver(mLayoutStateObserver); | ||
| } | ||
|
|
||
| private void observeTabModel() { | ||
| mTabModelSelectorTabModelObserver = new TabModelSelectorTabModelObserver(mModelSelector) { | ||
| @Override | ||
| public void willCloseTab(Tab tab, boolean animate) { | ||
| // TODO(crbug.com/1324405) Extract common logic between this method and | ||
| // willCloseAllTabs into a helper method. | ||
| if (mClosedAllTabs != null || tab.isIncognito()) return; | ||
|
|
||
| int tabId = tab.getId(); | ||
| TabModel model = mModelSelector.getModel(false); | ||
|
|
||
| if (!mTabSwitcherActive && mIsTablet) { | ||
| mTabsClosedFromTabStrip.add(tabId); | ||
| } | ||
|
|
||
| int selTabIndex = model.index(); | ||
| if (selTabIndex > -1 && selTabIndex < model.getCount()) { | ||
| Tab selectedTab = model.getTabAt(selTabIndex); | ||
| if (selectedTab != null && tabId == selectedTab.getId()) { | ||
| mSelectedTabIdWhenTabClosed = tabId; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void didSelectTab(Tab tab, int type, int lastId) { | ||
| // Undoing a selected tab closure, after manually switching tabs shouldn't switch | ||
| // focus to the reopened tab. | ||
| if (type == TabSelectionType.FROM_USER || type == TabSelectionType.FROM_OMNIBOX | ||
| || type == TabSelectionType.FROM_NEW) { | ||
| resetSelectionsForUndo(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void willCloseAllTabs(boolean incognito) { | ||
| if (!incognito) { | ||
| TabModel model = mModelSelector.getCurrentModel(); | ||
| int selTabIndex = model.index(); | ||
| mClosedAllTabs = true; | ||
| if (selTabIndex > -1 && selTabIndex < model.getCount()) { | ||
| Tab tab = model.getTabAt(selTabIndex); | ||
| if (tab != null) { | ||
| mSelectedTabIdWhenTabClosed = tab.getId(); | ||
| if (!mTabSwitcherActive && mIsTablet) { | ||
| mTabsClosedFromTabStrip.add(tab.getId()); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void tabClosureUndone(Tab tab) { | ||
| if (mClosedAllTabs != null) return; | ||
| int id = tab.getId(); | ||
| recordClosureCancellation(id); | ||
| if (mSelectedTabIdWhenTabClosed != null && mSelectedTabIdWhenTabClosed == id) { | ||
| selectPreviouslySelectedTab(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void allTabsClosureUndone() { | ||
| if (mSelectedTabIdWhenTabClosed != null) { | ||
| recordClosureCancellation(mSelectedTabIdWhenTabClosed); | ||
| selectPreviouslySelectedTab(); | ||
| } | ||
|
|
||
| resetSelectionsForUndo(); | ||
| mTabsClosedFromTabStrip.clear(); | ||
| } | ||
|
|
||
| @Override | ||
| public void tabClosureCommitted(Tab tab) { | ||
| if (!tab.isIncognito()) { | ||
| resetSelectionsForUndo(); | ||
| mTabsClosedFromTabStrip.clear(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void allTabsClosureCommitted(boolean isIncognito) { | ||
| if (!isIncognito) { | ||
| resetSelectionsForUndo(); | ||
| mTabsClosedFromTabStrip.clear(); | ||
| } | ||
| } | ||
|
|
||
| private void recordClosureCancellation(int id) { | ||
| // Only record the action if the tab was previously closed from the tab strip. | ||
| if (mTabsClosedFromTabStrip.contains(id)) { | ||
| RecordUserAction.record("TabletTabStrip.UndoCloseTab"); | ||
| mTabsClosedFromTabStrip.remove(id); | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| private void observeLayoutState() { | ||
| mLayoutManagerSupplierCallback = this::onLayoutManagerAvailable; | ||
| mLayoutManagerObservableSupplier.addObserver(mLayoutManagerSupplierCallback); | ||
| } | ||
|
|
||
| private void onLayoutManagerAvailable(LayoutManagerImpl layoutManager) { | ||
| mLayoutManager = layoutManager; | ||
| mLayoutStateObserver = new LayoutStateProvider.LayoutStateObserver() { | ||
| @Override | ||
| public void onFinishedShowing(int layoutType) { | ||
| if (layoutType != LayoutType.TAB_SWITCHER) return; | ||
| mTabSwitcherActive = true; | ||
| } | ||
|
|
||
| @Override | ||
| public void onFinishedHiding(int layoutType) { | ||
| if (layoutType != LayoutType.TAB_SWITCHER) return; | ||
| mTabSwitcherActive = false; | ||
| } | ||
| }; | ||
|
|
||
| mLayoutManager.addObserver(mLayoutStateObserver); | ||
| } | ||
|
|
||
| /** | ||
| * If a tab closure is undone, this selects tab if it was previously selected. | ||
| */ | ||
| private void selectPreviouslySelectedTab() { | ||
| TabModel model = mModelSelector.getCurrentModel(); | ||
| if (model == null || mSelectedTabIdWhenTabClosed == null) return; | ||
|
|
||
| int prevSelectedIndex = TabModelUtils.getTabIndexById(model, mSelectedTabIdWhenTabClosed); | ||
|
|
||
| TabModelUtils.setIndex(model, prevSelectedIndex, false, TabSelectionType.FROM_UNDO); | ||
| resetSelectionsForUndo(); | ||
| } | ||
|
|
||
| /** | ||
| * After a tab closure has been committed or user manually selects a different tab, these values | ||
| * are reset so the next undo closure action does not reselect the reopened tab. | ||
| */ | ||
| private void resetSelectionsForUndo() { | ||
| mSelectedTabIdWhenTabClosed = null; | ||
| mClosedAllTabs = null; | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| public TabModelSelectorTabModelObserver getTabModelSelectorTabModelObserverForTests() { | ||
| return mTabModelSelectorTabModelObserver; | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| public Callback<LayoutManagerImpl> getLayoutManagerSupplierCallbackForTests() { | ||
| return mLayoutManagerSupplierCallback; | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| public void setTabSwitcherVisibilityForTests(boolean tabSwitcherActive) { | ||
| this.mTabSwitcherActive = tabSwitcherActive; | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| public void setLayoutManagerForTesting(LayoutManagerImpl layoutManager) { | ||
| this.mLayoutManager = layoutManager; | ||
| } | ||
| } |
Oops, something went wrong.