Add update menu item and app menu icon badge

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.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.annotation.SuppressLint;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
@@ skipping 22 matching lines @@
     private TintedImageButton mHomeButton;
     private TintedImageButton mBackButton;
     private TintedImageButton mForwardButton;
     private TintedImageButton mReloadButton;
     private TintedImageButton mBookmarkButton;
     private ImageButton mAccessibilitySwitcherButton;
 
     private OnClickListener mBookmarkListener;
     private OnClickListener mTabSwitcherListener;
 
-    private boolean mInTabSwitcherwMode = false;
+    private boolean mIsInTabSwitcherMode = false;
 
     private boolean mShowTabStack;
 
+
     private NavigationPopup mNavigationPopup;
 
     private TabSwitcherDrawable mTabSwitcherButtonDrawable;
     private TabSwitcherDrawable mTabSwitcherButtonDrawableLight;
 
     private Boolean mUseLightColorAssets;
     private LocationBar mLocationBar;
 
     /**
      * Constructs a ToolbarTablet object.
@@ skipping 21 matching lines @@
         mTabSwitcherButtonDrawableLight =
                 TabSwitcherDrawable.createTabSwitcherDrawable(getResources(), true);
 
         mAccessibilitySwitcherButton = (ImageButton) findViewById(R.id.tab_switcher_button);
         mAccessibilitySwitcherButton.setImageDrawable(mTabSwitcherButtonDrawable);
         updateSwitcherButtonVisibility(mShowTabStack);
 
         mBookmarkButton = (TintedImageButton) findViewById(R.id.bookmark_button);
 
         mMenuButton = (TintedImageButton) findViewById(R.id.menu_button);
-        mMenuButton.setVisibility(
+        mMenuButtonWrapper.setVisibility(
                 shouldShowMenuButton() ? View.VISIBLE : View.GONE);
 
         if (mAccessibilitySwitcherButton.getVisibility() == View.GONE
-                && mMenuButton.getVisibility() == View.GONE) {
-            ApiCompatibilityUtils.setPaddingRelative((View) mMenuButton.getParent(), 0, 0,
+                && mMenuButtonWrapper.getVisibility() == View.GONE) {
+            ApiCompatibilityUtils.setPaddingRelative((View) mMenuButtonWrapper.getParent(), 0, 0,
                     getResources().getDimensionPixelSize(R.dimen.tablet_toolbar_end_padding), 0);
         }
     }
 
     /**
      * Sets up key listeners after native initialization is complete, so that we can invoke
      * native functions.
      */
     @Override
     public void onNativeLibraryReady() {
@@ skipping 200 matching lines @@
             mAccessibilitySwitcherButton.setImageDrawable(
                     incognito ? mTabSwitcherButtonDrawableLight : mTabSwitcherButtonDrawable);
             mLocationBar.updateVisualsForState();
             mUseLightColorAssets = incognito;
         }
         mLocationBar.setUrlBarFocus(false);
     }
 
     @Override
     protected void updateBackButtonVisibility(boolean canGoBack) {
-        boolean enableButton = canGoBack && !mInTabSwitcherwMode;
+        boolean enableButton = canGoBack && !mIsInTabSwitcherMode;
         mBackButton.setEnabled(enableButton);
         mBackButton.setFocusable(enableButton);
     }
 
     @Override
     protected void updateForwardButtonVisibility(boolean canGoForward) {
-        boolean enableButton = canGoForward && !mInTabSwitcherwMode;
+        boolean enableButton = canGoForward && !mIsInTabSwitcherMode;
         mForwardButton.setEnabled(enableButton);
         mForwardButton.setFocusable(enableButton);
     }
 
     @Override
     protected void updateReloadButtonVisibility(boolean isReloading) {
         if (isReloading) {
             mReloadButton.setImageResource(R.drawable.btn_close);
             mReloadButton.setContentDescription(getContext().getString(
                     R.string.accessibility_btn_stop_loading));
         } else {
             mReloadButton.setImageResource(R.drawable.btn_toolbar_reload);
             mReloadButton.setContentDescription(getContext().getString(
                     R.string.accessibility_btn_refresh));
         }
         mReloadButton.setTint(isIncognito() ? mLightModeTint : mDarkModeTint);
-        mReloadButton.setEnabled(!mInTabSwitcherwMode);
+        mReloadButton.setEnabled(!mIsInTabSwitcherMode);
     }
 
     @Override
     protected void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) {
         if (isBookmarked) {
             mBookmarkButton.setImageResource(R.drawable.btn_star_filled);
             // Non-incognito mode shows a blue filled star.
             mBookmarkButton.setTint(isIncognito()
                     ? mLightModeTint
                     : ApiCompatibilityUtils.getColorStateList(
                             getResources(), R.color.blue_mode_tint));
         } else {
             mBookmarkButton.setImageResource(R.drawable.btn_star);
             mBookmarkButton.setTint(isIncognito() ? mLightModeTint : mDarkModeTint);
         }
         mBookmarkButton.setEnabled(editingAllowed);
     }
 
     @Override
     protected void setTabSwitcherMode(
             boolean inTabSwitcherMode, boolean showToolbar, boolean delayAnimation) {
         if (mShowTabStack && inTabSwitcherMode) {
-            mInTabSwitcherwMode = true;
+            mIsInTabSwitcherMode = true;
             mBackButton.setEnabled(false);
             mForwardButton.setEnabled(false);
             mReloadButton.setEnabled(false);
             mLocationBar.getContainerView().setVisibility(View.INVISIBLE);
+            if (mShowMenuBadge && mUnbadgedMenuButtonDrawable != null) {
+                mMenuButton.setImageDrawable(mUnbadgedMenuButtonDrawable);
+                mMenuBadge.setVisibility(View.GONE);
+            }
         } else {
-            mInTabSwitcherwMode = false;
+            mIsInTabSwitcherMode = false;
             mLocationBar.getContainerView().setVisibility(View.VISIBLE);
+            if (mShowMenuBadge) {
+                setAppMenuUpdateBadgeToVisible();
+            }
         }
     }
 
     @Override
     protected void updateTabCountVisuals(int numberOfTabs) {
         mAccessibilitySwitcherButton.setContentDescription(
                 getResources().getString(R.string.accessibility_toolbar_btn_tabswitcher_toggle,
                         numberOfTabs));
         mTabSwitcherButtonDrawable.updateForTabCount(numberOfTabs, isIncognito());
         mTabSwitcherButtonDrawableLight.updateForTabCount(numberOfTabs, isIncognito());
@@ skipping 19 matching lines @@
     @Override
     protected void onHomeButtonUpdate(boolean homeButtonEnabled) {
         mHomeButton.setVisibility(homeButtonEnabled ? VISIBLE : GONE);
     }
 
     @Override
     public LocationBar getLocationBar() {
         return mLocationBar;
     }
 
+    @Override
+    public void showAppMenuUpdateBadge() {
+        super.showAppMenuUpdateBadge();
+        if (!mIsInTabSwitcherMode) {
+            setAppMenuUpdateBadgeToVisible();
+        }
+    }
 }