Reland "Horizontal tab switcher use tab toggle"

This reverts commit a55d47e1.

Reason for revert: The breakage that caused this revert was only present on the M70 branch and never happened on master. It was due to this CL referring to a drawable that was renamed in M71. This CL uses the new name so it broke the M70 build when it was cherry picked.

Original change's description:
> Revert "Horizontal tab switcher use tab toggle"
> 
> This reverts commit 61bed816.
> 
> Reason for revert: Broke [Build Non-Channel Targets] build step
> 
> Original change's description:
> > Horizontal tab switcher use tab toggle
> > 
> > Replace the HTS Incognito Button with a toggle.
> > 
> > Bug: 851166
> > Change-Id: I5c431abb508930ee1a9a24792f2299ea08d944cf
> > Reviewed-on: https://chromium-review.googlesource.com/1246453
> > Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
> > Commit-Queue: Pedro Amaral <amaralp@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#594780}
> 
> TBR=yusufo@chromium.org,amaralp@chromium.org
> 
> # Not skipping CQ checks because original CL landed > 1 day ago.
> 
> Bug: 851166
> Bug: 890673
> Change-Id: I3631d88c29bd950beea9280e97e0ff50ed332bc8
> Reviewed-on: https://chromium-review.googlesource.com/1253741
> Reviewed-by: Tobias Sargeant <tobiasjs@chromium.org>
> Commit-Queue: Tobias Sargeant <tobiasjs@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#595411}

TBR=yusufo@chromium.org,tobiasjs@chromium.org,amaralp@chromium.org

Change-Id: Iaee562d9f3c393480028749e265550b84cad4ae1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 851166, 890673
Reviewed-on: https://chromium-review.googlesource.com/1256104Reviewed-by: Pedro Amaral <amaralp@chromium.org>
Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Commit-Queue: Pedro Amaral <amaralp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595602}

chrome/android/java/res/layout/toolbar_phone_incognito_button.xml → chrome/android/java/res/layout/incognito_toggle_tabs.xml

@@ -4,5 +4,5 @@
      found in the LICENSE file. -->
 
 <!-- The incognito toggle toolbar button. -->
-<org.chromium.chrome.browser.widget.incognitotoggle.IncognitoToggleButton
+<org.chromium.chrome.browser.toolbar.IncognitoToggleTabLayout
     style="@style/ToolbarButton" />

chrome/android/java/res/layout/toolbar_phone.xml

@@ -38,6 +38,14 @@
         android:layout_height="match_parent"
         android:layout_gravity="top" />
 
+    <ViewStub
+        android:id="@+id/incognito_tabs_stub"
+        android:inflatedId="@+id/incognito_toggle_tabs"
+        android:layout="@layout/incognito_toggle_tabs"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center" />
+
     <LinearLayout android:id="@+id/toolbar_buttons"
         android:orientation="horizontal"
         android:layout_width="wrap_content"
@@ -55,14 +63,6 @@
                 style="@style/ToolbarButton"
                 android:paddingStart="8dp"
                 android:visibility="gone" />
-
-            <ViewStub
-                android:id="@+id/incognito_button_stub"
-                android:inflatedId="@+id/incognito_button"
-                android:layout="@layout/toolbar_phone_incognito_button"
-                style="@style/ToolbarButton"
-                android:contentDescription="@string/accessibility_tabstrip_btn_incognito_toggle_standard"
-                android:visibility="gone" />
         </FrameLayout>
 
         <ImageButton android:id="@+id/tab_switcher_button"

chrome/android/java/src/org/chromium/chrome/browser/toolbar/IncognitoToggleTabLayout.java

+// Copyright 2018 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.toolbar;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.support.design.widget.TabLayout;
+import android.support.v7.content.res.AppCompatResources;
+import android.util.AttributeSet;
+
+import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeFeatureList;
+import org.chromium.chrome.browser.tabmodel.EmptyTabModelSelectorObserver;
+import org.chromium.chrome.browser.tabmodel.TabModel;
+import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+import org.chromium.chrome.browser.widget.TintedImageView;
+
+/**
+ * TabLayout shown in the Horizontal Tab Switcher.
+ */
+public class IncognitoToggleTabLayout extends TabLayout {
+    private TabLayout.Tab mStandardButton;
+    private TabLayout.Tab mIncognitoButton;
+    private TintedImageView mStandardButtonIcon;
+    private TintedImageView mIncognitoButtonIcon;
+    private TabSwitcherDrawable mTabSwitcherDrawable;
+
+    private ColorStateList mTabIconDarkColor;
+    private ColorStateList mTabIconLightColor;
+    private ColorStateList mTabIconSelectedDarkColor;
+    private ColorStateList mTabIconSelectedLightColor;
+
+    private TabModelSelector mTabModelSelector;
+
+    /**
+     * Constructor for inflating from XML.
+     */
+    public IncognitoToggleTabLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        mTabIconDarkColor =
+                AppCompatResources.getColorStateList(getContext(), R.color.dark_mode_tint);
+        mTabIconSelectedDarkColor =
+                AppCompatResources.getColorStateList(getContext(), R.color.light_active_color);
+        mTabIconLightColor =
+                AppCompatResources.getColorStateList(getContext(), R.color.white_alpha_70);
+        mTabIconSelectedLightColor =
+                AppCompatResources.getColorStateList(getContext(), R.color.white_mode_tint);
+
+        mStandardButtonIcon = new TintedImageView(getContext());
+        mTabSwitcherDrawable = TabSwitcherDrawable.createTabSwitcherDrawable(getContext(), false);
+        mStandardButtonIcon.setImageDrawable(mTabSwitcherDrawable);
+        mIncognitoButtonIcon = new TintedImageView(getContext());
+        mIncognitoButtonIcon.setImageResource(R.drawable.incognito_simple);
+
+        mStandardButton =
+                newTab().setCustomView(mStandardButtonIcon)
+                        .setContentDescription(R.string.accessibility_tab_switcher_standard_stack);
+        addTab(mStandardButton);
+        mIncognitoButton =
+                newTab().setCustomView(mIncognitoButtonIcon)
+                        .setContentDescription(
+                                ChromeFeatureList.isEnabled(ChromeFeatureList.INCOGNITO_STRINGS)
+                                        ? R.string.accessibility_tab_switcher_private_stack
+                                        : R.string.accessibility_tab_switcher_incognito_stack);
+        addTab(mIncognitoButton);
+
+        addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                setSelectedModel(mIncognitoButton.isSelected());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {}
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {}
+        });
+    }
+
+    /**
+     * @param selector A {@link TabModelSelector} to provide information about open tabs.
+     */
+    public void setTabModelSelector(TabModelSelector selector) {
+        mTabModelSelector = selector;
+        if (mTabModelSelector == null) return;
+        mTabModelSelector.addObserver(new EmptyTabModelSelectorObserver() {
+            @Override
+            public void onTabModelSelected(TabModel newModel, TabModel oldModel) {
+                setStateBasedOnModel();
+            }
+        });
+        setStateBasedOnModel();
+    }
+
+    /**
+     * Update the visual state based on number of normal (non-incognito) tabs present.
+     * @param tabCount The number of normal tabs.
+     */
+    public void updateTabCount(int tabCount) {
+        mTabSwitcherDrawable.updateForTabCount(tabCount, false);
+    }
+
+    private void setStateBasedOnModel() {
+        if (mTabModelSelector == null) return;
+        final boolean isIncognitoSelected = mTabModelSelector.isIncognitoSelected();
+        if (isIncognitoSelected) {
+            setSelectedTabIndicatorColor(mTabIconSelectedLightColor.getDefaultColor());
+            mStandardButtonIcon.setTint(mTabIconLightColor);
+            mTabSwitcherDrawable.setTint(mTabIconLightColor);
+            mIncognitoButtonIcon.setTint(mTabIconSelectedLightColor);
+        } else {
+            setSelectedTabIndicatorColor(mTabIconSelectedDarkColor.getDefaultColor());
+            mStandardButtonIcon.setTint(mTabIconSelectedDarkColor);
+            mTabSwitcherDrawable.setTint(mTabIconSelectedDarkColor);
+            mIncognitoButtonIcon.setTint(mTabIconDarkColor);
+        }
+        // Ensure the tab in tab layout is correctly selected when tab switcher is
+        // first opened.
+        if (isIncognitoSelected && !mIncognitoButton.isSelected()) {
+            mIncognitoButton.select();
+        } else if (!isIncognitoSelected && !mStandardButton.isSelected()) {
+            mStandardButton.select();
+        }
+    }
+
+    private void setSelectedModel(boolean incognitoSelected) {
+        if (mTabModelSelector == null
+                || incognitoSelected == mTabModelSelector.isIncognitoSelected()) {
+            return;
+        }
+
+        mTabModelSelector.commitAllTabClosures();
+        mTabModelSelector.selectModel(incognitoSelected);
+    }
+}

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

@@ -79,7 +79,6 @@ import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.util.MathUtils;
 import org.chromium.chrome.browser.util.ViewUtils;
 import org.chromium.chrome.browser.widget.animation.CancelAwareAnimatorListener;
-import org.chromium.chrome.browser.widget.incognitotoggle.IncognitoToggleButton;
 import org.chromium.chrome.browser.widget.newtab.NewTabButton;
 import org.chromium.chrome.browser.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.EventConstants;
@@ -146,7 +145,7 @@ public class ToolbarPhone extends ToolbarLayout
     protected LocationBarPhone mLocationBar;
 
     protected ViewGroup mToolbarButtonsContainer;
-    private IncognitoToggleButton mIncognitoToggleButton;
+    private IncognitoToggleTabLayout mIncognitoToggleTabLayout;
     protected ImageView mToggleTabStackButton;
     protected NewTabButton mNewTabButton;
     protected @Nullable AppCompatImageButton mHomeButton;
@@ -196,7 +195,6 @@ public class ToolbarPhone extends ToolbarLayout
 
     private OnClickListener mTabSwitcherListener;
     private OnClickListener mNewTabListener;
-    private OnClickListener mIncognitoListener;
 
     @ViewDebug.ExportedProperty(category = "chrome")
     protected boolean mUrlFocusChangeInProgress;
@@ -610,8 +608,6 @@ public class ToolbarPhone extends ToolbarLayout
                 RecordUserAction.record("MobileNewTabOpened");
                 // TODO(kkimlabs): Record UMA action for homepage button.
             }
-        } else if (mIncognitoToggleButton == v) {
-            if (mIncognitoListener != null) mIncognitoListener.onClick(v);
         } else if (mHomeButton != null && mHomeButton == v) {
             openHomepage();
             if (isNativeLibraryReady()
@@ -812,19 +808,7 @@ public class ToolbarPhone extends ToolbarLayout
      * @return The right bounds of the location bar after accounting for any visible left buttons.
      */
     protected int getBoundsAfterAccountingForRightButtons() {
-        // We set the incognito toggle button's visibility from GONE to VISIBLE when the tab
-        // switcher starts to open, but we don't want this to affect the Omnibox's size during the
-        // animation, so we have to make an adjustment here.
-        // However, if the experimental button is showing it sits in a FrameLayout with the
-        // incognito button and the omnibox will be appropriately sized without an explicit
-        // adjustment.
-        int incognitoButtonWidth = 0;
-        if (mIncognitoToggleButton != null && mIncognitoToggleButton.getVisibility() == VISIBLE
-                && (mExperimentalButton == null || mExperimentalButton.getVisibility() == GONE)) {
-            incognitoButtonWidth += mIncognitoToggleButton.getMeasuredWidth();
-        }
-        return Math.max(mToolbarSidePadding,
-                mToolbarButtonsContainer.getMeasuredWidth() - incognitoButtonWidth);
+        return Math.max(mToolbarSidePadding, mToolbarButtonsContainer.getMeasuredWidth());
     }
 
     protected void updateToolbarBackground(int color) {
@@ -1836,24 +1820,21 @@ public class ToolbarPhone extends ToolbarLayout
 
         // Don't inflate the incognito toggle button unless the horizontal tab switcher experiment
         // is enabled and the user actually enters the tab switcher.
-        if (!FeatureUtilities.isBottomToolbarEnabled() && mIncognitoToggleButton == null
+        if (!FeatureUtilities.isBottomToolbarEnabled() && mIncognitoToggleTabLayout == null
                 && mTabSwitcherState != STATIC_TAB && usingHorizontalTabSwitcher()
                 && PrefServiceBridge.getInstance().isIncognitoModeEnabled()) {
-            ViewStub incognitoToggleButtonStub = findViewById(R.id.incognito_button_stub);
-            mIncognitoToggleButton = (IncognitoToggleButton) incognitoToggleButtonStub.inflate();
-            mIncognitoToggleButton.setOnClickListener(this);
-            mIncognitoToggleButton.setTabModelSelector(mTabModelSelector);
-            mTabSwitcherModeViews.add(mIncognitoToggleButton);
+            ViewStub incognitoToggleTabsStub = findViewById(R.id.incognito_tabs_stub);
+            mIncognitoToggleTabLayout =
+                    (IncognitoToggleTabLayout) incognitoToggleTabsStub.inflate();
+            mIncognitoToggleTabLayout.setTabModelSelector(mTabModelSelector);
+            mTabSwitcherModeViews.add(mIncognitoToggleTabLayout);
+            mIncognitoToggleTabLayout.updateTabCount(mTabModelSelector.getModel(false).getCount());
+
+            mBrowsingModeViews.add(mToggleTabStackButton);
         }
 
         for (View view : mTabSwitcherModeViews) {
-            // The incognito toggle button needs to be set to GONE rather than INVISIBLE so it
-            // doesn't reduce the space available for the Omnibox.
-            if (view == mIncognitoToggleButton && tabSwitcherViewsVisibility == INVISIBLE) {
-                view.setVisibility(GONE);
-            } else {
-                view.setVisibility(tabSwitcherViewsVisibility);
-            }
+            view.setVisibility(tabSwitcherViewsVisibility);
         }
         for (View view : mBrowsingModeViews) {
             view.setVisibility(browsingViewsVisibility);
@@ -1923,7 +1904,8 @@ public class ToolbarPhone extends ToolbarLayout
         } else {
             if (!mDelayingTabSwitcherAnimation) {
                 mTabSwitcherModeAnimation = createExitTabSwitcherAnimation(showToolbar);
-                if (mIncognitoToggleButton != null) mIncognitoToggleButton.setClickable(false);
+                if (mIncognitoToggleTabLayout != null)
+                    mIncognitoToggleTabLayout.setClickable(false);
             }
         }
 
@@ -1956,7 +1938,7 @@ public class ToolbarPhone extends ToolbarLayout
 
     @Override
     protected void onTabSwitcherTransitionFinished() {
-        if (mIncognitoToggleButton != null) mIncognitoToggleButton.setClickable(true);
+        if (mIncognitoToggleTabLayout != null) mIncognitoToggleTabLayout.setClickable(true);
 
         setAlpha(1.f);
         mClipRect = null;
@@ -2000,11 +1982,6 @@ public class ToolbarPhone extends ToolbarLayout
         mNewTabListener = listener;
     }
 
-    @Override
-    public void setIncognitoClickHandler(OnClickListener listener) {
-        mIncognitoListener = listener;
-    }
-
     @Override
     protected void onAccessibilityStatusChanged(boolean enabled) {
         super.onAccessibilityStatusChanged(enabled);
@@ -2260,6 +2237,10 @@ public class ToolbarPhone extends ToolbarLayout
         mTabSwitcherButtonDrawableLight.updateForTabCount(numberOfTabs, isIncognito());
         mTabSwitcherButtonDrawable.updateForTabCount(numberOfTabs, isIncognito());
 
+        if (!isIncognito() && mIncognitoToggleTabLayout != null) {
+            mIncognitoToggleTabLayout.updateTabCount(numberOfTabs);
+        }
+
         boolean useTabStackDrawableLight = isIncognito()
                 || ColorUtils.shouldUseLightForegroundOnBackground(getTabThemeColor());
         if (mTabSwitcherAnimationTabStackDrawable == null
@@ -2669,8 +2650,8 @@ public class ToolbarPhone extends ToolbarLayout
     @Override
     public void setTabModelSelector(TabModelSelector selector) {
         mTabModelSelector = selector;
-        if (mIncognitoToggleButton != null) {
-            mIncognitoToggleButton.setTabModelSelector(mTabModelSelector);
+        if (mIncognitoToggleTabLayout != null) {
+            mIncognitoToggleTabLayout.setTabModelSelector(mTabModelSelector);
         }
     }
 

chrome/android/java_sources.gni

@@ -1502,6 +1502,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/toolbar/MenuButton.java",
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarButtonSlotData.java",
   "java/src/org/chromium/chrome/browser/toolbar/HomePageButton.java",
+  "java/src/org/chromium/chrome/browser/toolbar/IncognitoToggleTabLayout.java",
   "java/src/org/chromium/chrome/browser/toolbar/KeyboardNavigationListener.java",
   "java/src/org/chromium/chrome/browser/toolbar/ScrollingBottomViewResourceFrameLayout.java",
   "java/src/org/chromium/chrome/browser/toolbar/TabSwitcherButtonViewBinder.java",