Replace update menu 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 251 matching lines @@
             RecordUserAction.record("MobileTabClobbered");
         } else if (mReloadButton == v) {
             stopOrReloadCurrentTab();
         } else if (mBookmarkButton == v) {
             if (mBookmarkListener != null) {
                 mBookmarkListener.onClick(mBookmarkButton);
                 RecordUserAction.record("MobileToolbarToggleBookmark");
             }
         } else if (mAccessibilitySwitcherButton == v) {
             if (mTabSwitcherListener != null) {
+                cancelAppMenuUpdateBadgeAnimation();
                 mTabSwitcherListener.onClick(mAccessibilitySwitcherButton);
             }
         }
     }
 
     private void updateSwitcherButtonVisibility(boolean enabled) {
         mAccessibilitySwitcherButton.setVisibility(mShowTabStack || enabled
                 ? View.VISIBLE : View.GONE);
     }
 
@@ skipping 16 matching lines @@
             mForwardButton.setTint(incognito ? mLightModeTint : mDarkModeTint);
             if (incognito) {
                 mLocationBar.getContainerView().getBackground().setAlpha(
                         ToolbarPhone.LOCATION_BAR_TRANSPARENT_BACKGROUND_ALPHA);
             } else {
                 mLocationBar.getContainerView().getBackground().setAlpha(255);
             }
             mAccessibilitySwitcherButton.setImageDrawable(
                     incognito ? mTabSwitcherButtonDrawableLight : mTabSwitcherButtonDrawable);
             mLocationBar.updateVisualsForState();
+            if (mShowMenuBadge) {
+                setAppMenuUpdateBadgeDrawable(incognito);
+            }
             mUseLightColorAssets = incognito;
         }
         mLocationBar.setUrlBarFocus(false);
     }
 
     @Override
     protected void updateBackButtonVisibility(boolean canGoBack) {
         boolean enableButton = canGoBack && !mIsInTabSwitcherMode;
         mBackButton.setEnabled(enableButton);
         mBackButton.setFocusable(enableButton);
@@ skipping 39 matching lines @@
 
     @Override
     protected void setTabSwitcherMode(
             boolean inTabSwitcherMode, boolean showToolbar, boolean delayAnimation) {
         if (mShowTabStack && inTabSwitcherMode) {
             mIsInTabSwitcherMode = true;
             mBackButton.setEnabled(false);
             mForwardButton.setEnabled(false);
             mReloadButton.setEnabled(false);
             mLocationBar.getContainerView().setVisibility(View.INVISIBLE);
-            if (mShowMenuBadge && mUnbadgedMenuButtonDrawable != null) {
-                mMenuButton.setImageDrawable(mUnbadgedMenuButtonDrawable);
+            if (mShowMenuBadge) {
                 mMenuBadge.setVisibility(View.GONE);
             }
         } else {
             mIsInTabSwitcherMode = false;
             mLocationBar.getContainerView().setVisibility(View.VISIBLE);
             if (mShowMenuBadge) {
-                setAppMenuUpdateBadgeToVisible();
+                setAppMenuUpdateBadgeToVisible(false);
             }
         }
     }
 
     @Override
     protected void updateTabCountVisuals(int numberOfTabs) {
         mAccessibilitySwitcherButton.setContentDescription(
                 getResources().getString(R.string.accessibility_toolbar_btn_tabswitcher_toggle,
                         numberOfTabs));
         mTabSwitcherButtonDrawable.updateForTabCount(numberOfTabs, isIncognito());
@@ skipping 24 matching lines @@
 
     @Override
     public LocationBar getLocationBar() {
         return mLocationBar;
     }
 
     @Override
     public void showAppMenuUpdateBadge() {
         super.showAppMenuUpdateBadge();
         if (!mIsInTabSwitcherMode) {
-            setAppMenuUpdateBadgeToVisible();
+            if (mUseLightColorAssets) {
+                setAppMenuUpdateBadgeDrawable(mUseLightColorAssets);
+            }
+            setAppMenuUpdateBadgeToVisible(true);
         }
     }
 }