Unify home button across top and bottom toolbars

Bug: 903864
Change-Id: I7110ee2b0e6eab650d9388c828738ad349e20cc2
Reviewed-on: https://chromium-review.googlesource.com/c/1340791
Commit-Queue: Pedro Amaral <amaralp@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611455}

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

@@ -37,7 +37,7 @@
             android:paddingStart="@dimen/bottom_toolbar_start_padding"
             android:paddingEnd="@dimen/bottom_toolbar_end_padding" >
 
-            <org.chromium.chrome.browser.toolbar.bottom.HomeButton
+            <org.chromium.chrome.browser.toolbar.HomeButton
                 android:id="@+id/home_button"
                 style="@style/BottomToolbarButton"
                 android:contentDescription="@string/accessibility_toolbar_btn_home" />

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

@@ -23,7 +23,7 @@
         android:visibility="invisible"
         android:contentDescription="@string/accessibility_toolbar_btn_new_tab" />
 
-    <org.chromium.chrome.browser.toolbar.HomePageButton
+    <org.chromium.chrome.browser.toolbar.HomeButton
         android:id="@+id/home_button"
         style="@style/ToolbarButton"
         android:src="@drawable/btn_toolbar_home"

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

@@ -22,7 +22,7 @@
         android:layout_height="match_parent"
         android:orientation="horizontal" >
 
-        <org.chromium.chrome.browser.toolbar.HomePageButton
+        <org.chromium.chrome.browser.toolbar.HomeButton
             android:id="@+id/home_button"
             style="@style/ToolbarButton"
             android:src="@drawable/btn_toolbar_home"

chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/HomeButton.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/HomeButton.java

@@ -2,16 +2,22 @@
 // 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.bottom;
+package org.chromium.chrome.browser.toolbar;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnCreateContextMenuListener;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.toolbar.ThemeColorProvider;
+import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.toolbar.ThemeColorProvider.ThemeColorObserver;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.ui.widget.ChromeImageButton;
@@ -19,7 +25,11 @@ import org.chromium.ui.widget.ChromeImageButton;
 /**
  * The home button.
  */
-class HomeButton extends ChromeImageButton implements ThemeColorObserver {
+public class HomeButton extends ChromeImageButton implements ThemeColorObserver,
+                                                             OnCreateContextMenuListener,
+                                                             MenuItem.OnMenuItemClickListener {
+    private static final int ID_REMOVE = 0;
+
     /** A provider that notifies components when the theme color changes.*/
     private ThemeColorProvider mThemeColorProvider;
 
@@ -30,22 +40,38 @@ class HomeButton extends ChromeImageButton implements ThemeColorObserver {
                 ? R.drawable.ic_home
                 : R.drawable.btn_toolbar_home;
         setImageDrawable(ContextCompat.getDrawable(context, homeButtonIcon));
+        if (!FeatureUtilities.isNewTabPageButtonEnabled()
+                && !FeatureUtilities.isBottomToolbarEnabled()) {
+            setOnCreateContextMenuListener(this);
         }
-
-    void setThemeColorProvider(ThemeColorProvider themeColorProvider) {
-        mThemeColorProvider = themeColorProvider;
-        mThemeColorProvider.addObserver(this);
     }
 
-    void destroy() {
+    public void destroy() {
         if (mThemeColorProvider != null) {
             mThemeColorProvider.removeObserver(this);
             mThemeColorProvider = null;
         }
     }
 
+    public void setThemeColorProvider(ThemeColorProvider themeColorProvider) {
+        mThemeColorProvider = themeColorProvider;
+        mThemeColorProvider.addObserver(this);
+    }
+
     @Override
     public void onThemeColorChanged(ColorStateList tint, int primaryColor) {
         ApiCompatibilityUtils.setImageTintList(this, tint);
     }
+
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+        menu.add(Menu.NONE, ID_REMOVE, Menu.NONE, R.string.remove).setOnMenuItemClickListener(this);
+    }
+
+    @Override
+    public boolean onMenuItemClick(MenuItem item) {
+        assert item.getItemId() == ID_REMOVE;
+        HomepageManager.getInstance().setPrefHomepageEnabled(false);
+        return true;
+    }
 }

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

-// Copyright 2015 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.util.AttributeSet;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnCreateContextMenuListener;
-
-import org.chromium.chrome.R;
-import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
-import org.chromium.chrome.browser.util.FeatureUtilities;
-import org.chromium.ui.widget.ChromeImageButton;
-
-/**
- * View that displays the home page button.
- */
-public class HomePageButton extends ChromeImageButton
-        implements OnCreateContextMenuListener, MenuItem.OnMenuItemClickListener {
-    private static final int ID_REMOVE = 0;
-
-    /** Constructor inflating from XML. */
-    public HomePageButton(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        if (!FeatureUtilities.isNewTabPageButtonEnabled()) setOnCreateContextMenuListener(this);
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-        menu.add(Menu.NONE, ID_REMOVE, Menu.NONE, R.string.remove)
-                .setOnMenuItemClickListener(this);
-    }
-
-    @Override
-    public boolean onMenuItemClick(MenuItem item) {
-        assert item.getItemId() == ID_REMOVE;
-        HomepageManager.getInstance().setPrefHomepageEnabled(false);
-        return true;
-    }
-}

chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java

@@ -19,6 +19,7 @@ import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
 import org.chromium.chrome.browser.modelutil.PropertyModelChangeProcessor;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+import org.chromium.chrome.browser.toolbar.HomeButton;
 import org.chromium.chrome.browser.toolbar.MenuButton;
 import org.chromium.chrome.browser.toolbar.TabCountProvider;
 import org.chromium.chrome.browser.toolbar.TabSwitcherButtonCoordinator;

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java

@@ -45,7 +45,6 @@ import org.chromium.chrome.browser.toolbar.MenuButton;
 import org.chromium.chrome.browser.toolbar.TabCountProvider;
 import org.chromium.chrome.browser.toolbar.ToolbarDataProvider;
 import org.chromium.chrome.browser.toolbar.ToolbarTabController;
-import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.util.ViewUtils;
 import org.chromium.chrome.browser.widget.PulseDrawable;
 import org.chromium.chrome.browser.widget.ToolbarProgressBar;
@@ -958,15 +957,4 @@ public abstract class ToolbarLayout extends FrameLayout {
      * it.
      */
     void setTabModelSelector(TabModelSelector selector) {}
-
-    /**
-     * Sets the icon drawable for the ntp button if the ntp button feature is enabled.
-     * Note: This method is called twice in ToolbarLayout's children - once in
-     * #onNativeLibraryReady() & once in #onFinishInflate() (see https://crbug.com/862887).
-     * @param ntpButton The button that needs to be changed.
-     */
-    void changeIconToNTPIcon(ImageButton ntpButton) {
-        if (FeatureUtilities.isNewTabPageButtonEnabled())
-            ntpButton.setImageResource(R.drawable.ic_home);
-    }
 }

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

@@ -382,7 +382,6 @@ public class ToolbarPhone
             mToolbarButtonsContainer = (ViewGroup) findViewById(R.id.toolbar_buttons);
 
             mHomeButton = findViewById(R.id.home_button);
-            changeIconToNTPIcon(mHomeButton);
             if (FeatureUtilities.isBottomToolbarEnabled()) {
                 disableMenuButton();
                 if (mHomeButton != null) {
@@ -510,7 +509,6 @@ public class ToolbarPhone
         if (!FeatureUtilities.isBottomToolbarEnabled()) enableTabSwitchingResources();
 
         if (mHomeButton != null) {
-            changeIconToNTPIcon(mHomeButton);
             mHomeButton.setOnClickListener(this);
         }
 

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java

@@ -105,7 +105,6 @@ public class ToolbarTablet extends ToolbarLayout
         mLocationBar = (LocationBarTablet) findViewById(R.id.location_bar);
 
         mHomeButton = findViewById(R.id.home_button);
-        changeIconToNTPIcon(mHomeButton);
         mBackButton = findViewById(R.id.back_button);
         mForwardButton = findViewById(R.id.forward_button);
         mReloadButton = findViewById(R.id.refresh_button);
@@ -163,7 +162,6 @@ public class ToolbarTablet extends ToolbarLayout
     public void onNativeLibraryReady() {
         super.onNativeLibraryReady();
         mLocationBar.onNativeLibraryReady();
-        changeIconToNTPIcon(mHomeButton);
         mHomeButton.setOnClickListener(this);
         mHomeButton.setOnKeyListener(new KeyboardNavigationListener() {
             @Override

chrome/android/java_sources.gni

@@ -1577,7 +1577,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/tabmodel/document/StorageDelegate.java",
   "java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java",
   "java/src/org/chromium/chrome/browser/tasks/TasksUma.java",
-  "java/src/org/chromium/chrome/browser/toolbar/HomePageButton.java",
+  "java/src/org/chromium/chrome/browser/toolbar/HomeButton.java",
   "java/src/org/chromium/chrome/browser/toolbar/IncognitoStateProvider.java",
   "java/src/org/chromium/chrome/browser/toolbar/IncognitoToggleTabLayout.java",
   "java/src/org/chromium/chrome/browser/toolbar/KeyboardNavigationListener.java",
@@ -1600,7 +1600,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java",
-  "java/src/org/chromium/chrome/browser/toolbar/bottom/HomeButton.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewResourceFrameLayout.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java",