Add support for highlighting menu items

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.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.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.appmenu.AppMenuButtonHelper;
+import org.chromium.chrome.browser.appmenu.PulseDrawable;
+import org.chromium.chrome.browser.appmenu.PulseDrawableFactory;
 import org.chromium.chrome.browser.compositor.Invalidator;
 import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
 import org.chromium.chrome.browser.fullscreen.BrowserStateBrowserControlsVisibilityDelegate;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper;
 import org.chromium.chrome.browser.omnibox.LocationBar;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.ViewUtils;
 import org.chromium.chrome.browser.widget.TintedImageButton;
 import org.chromium.chrome.browser.widget.ToolbarProgressBar;
@@ skipping 31 matching lines @@
     @Nullable
     protected ToolbarProgressBar mProgressBar;
 
     private boolean mNativeLibraryReady;
     private boolean mUrlHasFocus;
 
     private long mFirstDrawTimeMs;
 
     private boolean mFindInPageToolbarShowing;
 
+    protected boolean mHighlightingMenu;
+    private PulseDrawable mHighlightDrawable;
+
     protected boolean mShowMenuBadge;
     private AnimatorSet mMenuBadgeAnimatorSet;
     private boolean mIsMenuBadgeAnimationRunning;
 
     /**
      * Basic constructor for {@link ToolbarLayout}.
      */
     public ToolbarLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
         mDarkModeTint =
@@ skipping 556 matching lines @@
      */
     protected boolean isIncognito() {
         return mToolbarDataProvider.isIncognito();
     }
 
     /**
      * @return {@link LocationBar} object this {@link ToolbarLayout} contains.
      */
     public abstract LocationBar getLocationBar();
 
+    public abstract boolean useLightDrawables();

[Ted C, 2017/04/12 18:05:57]

javadoc

[David Trainor- moved to gerrit, 2017/04/12 18:59:37]

Done.

+
     /**
      * Navigates the current Tab back.
      * @return Whether or not the current Tab did go back.
      */
     protected boolean back() {
         getLocationBar().hideSuggestions();
         return mToolbarTabController != null ? mToolbarTabController.back() : false;
     }
 
     /**
@@ skipping 18 matching lines @@
 
     /**
      * Opens hompage in the current tab.
      */
     protected void openHomepage() {
         getLocationBar().hideSuggestions();
         if (mToolbarTabController != null) mToolbarTabController.openHomepage();
     }
 
     @Override
+    public void setMenuButtonHighlight(boolean highlight) {
+        mHighlightingMenu = highlight;
+        setMenuButtonHighlightDrawable(mHighlightingMenu);
+    }
+
+    @Override
     public void showAppMenuUpdateBadge() {
         mShowMenuBadge = true;
     }
 
     @Override
     public boolean isShowingAppMenuUpdateBadge() {
         return mShowMenuBadge;
     }
 
     @Override
@@ skipping 84 matching lines @@
     /**
      * Sets the update menu badge drawable to the light or dark asset.
      * @param useLightDrawable Whether the light drawable should be used.
      */
     protected void setAppMenuUpdateBadgeDrawable(boolean useLightDrawable) {
         mMenuBadge.setImageResource(useLightDrawable ? R.drawable.badge_update_light
                 : R.drawable.badge_update_dark);
     }
 
     /**
+     * Sets the menu button's background depending on whether or not we are highlighting and whether
+     * or not we are using light or dark assets.
+     * @param highlighting     Whether or not the menu button should be highlighted.

[Ted C, 2017/04/12 18:05:57]

too much space after highlighting

[David Trainor- moved to gerrit, 2017/04/12 18:59:37]

Done.

+     */
+    protected void setMenuButtonHighlightDrawable(boolean highlighting) {
+        if (highlighting) {
+            if (mHighlightDrawable == null) {
+                mHighlightDrawable = PulseDrawableFactory.createCircle();
+                mHighlightDrawable.setInset(ApiCompatibilityUtils.getPaddingStart(mMenuButton),
+                        mMenuButton.getPaddingTop(),
+                        ApiCompatibilityUtils.getPaddingEnd(mMenuButton),
+                        mMenuButton.getPaddingBottom());
+            }
+            int colorRes = useLightDrawables() ? R.color.google_grey_100 : R.color.google_blue_500;
+            int color = ApiCompatibilityUtils.getColor(getResources(), colorRes);
+            mHighlightDrawable.setColor(color);

[Ted C, 2017/04/12 18:05:57]

ah...so we already use different colors.  Can we just say dark or light here
instead allowing passing colors?

[David Trainor- moved to gerrit, 2017/04/12 18:59:37]

Yeah good idea

+            mMenuButtonWrapper.setBackground(mHighlightDrawable);
+            mHighlightDrawable.start();
+        } else {
+            mMenuButtonWrapper.setBackground(null);
+        }
+    }
+
+    /**
      * Sets the content description for the menu button.
      * @param isUpdateBadgeVisible Whether the update menu badge is visible.
      */
     protected void setMenuButtonContentDescription(boolean isUpdateBadgeVisible) {
         if (isUpdateBadgeVisible) {
             mMenuButton.setContentDescription(getResources().getString(
                     R.string.accessibility_toolbar_btn_menu_update));
         } else {
             mMenuButton.setContentDescription(getResources().getString(
                     R.string.accessibility_toolbar_btn_menu));
         }
     }
 
     @Override
     public void setBottomSheet(BottomSheet sheet) {}
 }