Add update menu item and app menu icon badge

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.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.animation.ObjectAnimator;
@@ skipping 28 matching lines @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.SysUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.Invalidator;
 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.omnibox.LocationBarPhone;
 import org.chromium.chrome.browser.omnibox.UrlContainer;
 import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.ColorUtils;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.util.MathUtils;
 import org.chromium.chrome.browser.widget.TintedImageButton;
 import org.chromium.chrome.browser.widget.newtab.NewTabButton;
@@ skipping 42 matching lines @@
 
     private final int mProgressBackBackgroundColor;
     private final int mProgressBackBackgroundColorWhite;
 
     private ObjectAnimator mTabSwitcherModeAnimation;
     private ObjectAnimator mDelayedTabSwitcherModeAnimation;
 
     private final List<View> mTabSwitcherModeViews = new ArrayList<View>();
     private final Set<View> mBrowsingModeViews = new HashSet<View>();
     @ViewDebug.ExportedProperty(category = "chrome")
-    private boolean mInTabSwitcherMode;
+    private boolean mIsInTabSwitcherMode;
 
     // This determines whether or not the toolbar draws as expected (false) or whether it always
     // draws as if it's showing the non-tabswitcher, non-animating toolbar. This is used in grabbing
     // a bitmap to use as a texture representation of this view.
     @ViewDebug.ExportedProperty(category = "chrome")
     private boolean mTextureCaptureMode;
 
     @ViewDebug.ExportedProperty(category = "chrome")
     private boolean mAnimateNormalToolbar;
     @ViewDebug.ExportedProperty(category = "chrome")
     private boolean mDelayingTabSwitcherAnimation;
 
     private ColorDrawable mTabSwitcherAnimationBgOverlay;
     private TabSwitcherDrawable mTabSwitcherAnimationTabStackDrawable;
     private Drawable mTabSwitcherAnimationMenuDrawable;
+    private Drawable mTabSwitcherAnimationMenuBadgeDrawable;
     // Value that determines the amount of transition from the normal toolbar mode to TabSwitcher
     // mode.  0 = entirely in normal mode and 1.0 = entirely in TabSwitcher mode.  In between values
     // can be used for animating between the two view modes.
     @ViewDebug.ExportedProperty(category = "chrome")
     private float mTabSwitcherModePercent = 0;
     @ViewDebug.ExportedProperty(category = "chrome")
     private boolean mUIAnimatingTabSwitcherTransition;
 
     // Used to clip the toolbar during the fade transition into and out of TabSwitcher mode.  Only
     // used when |mAnimateNormalToolbar| is false.
@@ skipping 139 matching lines @@
 
         mLocationBarBackground =
                 ApiCompatibilityUtils.getDrawable(getResources(), R.drawable.inset_textbox);
         mLocationBarBackground.getPadding(mUrlBackgroundPadding);
         mPhoneLocationBar.setPadding(
                 mUrlBackgroundPadding.left, mUrlBackgroundPadding.top,
                 mUrlBackgroundPadding.right, mUrlBackgroundPadding.bottom);
 
         setLayoutTransition(null);
 
-        mMenuButton.setVisibility(shouldShowMenuButton() ? View.VISIBLE : View.GONE);
+        mMenuButtonWrapper.setVisibility(shouldShowMenuButton() ? View.VISIBLE : View.GONE);
         if (FeatureUtilities.isDocumentMode(getContext())) {
             ApiCompatibilityUtils.setMarginEnd(
-                    (MarginLayoutParams) mMenuButton.getLayoutParams(),
+                    (MarginLayoutParams) mMenuButtonWrapper.getLayoutParams(),
                     getResources().getDimensionPixelSize(R.dimen.document_toolbar_menu_offset));
         }
 
         if (FeatureUtilities.isTabSwitchingEnabled(getContext())) {
             inflateTabSwitchingResources();
         } else {
             hideTabSwitchingResources();
         }
 
         setWillNotDraw(false);
@@ skipping 104 matching lines @@
                 return mToggleTabStackButton;
             }
 
             @Override
             protected boolean handleEnterKeyPress() {
                 return getMenuButtonHelper().onEnterKeyPress(mMenuButton);
             }
         });
         onHomeButtonUpdate(HomepageManager.isHomepageEnabled(getContext()));
 
-        updateVisualsForToolbarState(mInTabSwitcherMode);
+        updateVisualsForToolbarState(mIsInTabSwitcherMode);
     }
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         // If the NTP is partially scrolled, prevent all touch events to the child views.  This
         // is to not allow a secondary touch event to trigger entering the tab switcher, which
         // can lead to really odd snapshots and transitions to the switcher.
         if (mNtpSearchBoxScrollPercent != 0f
                 && mNtpSearchBoxScrollPercent != 1f
                 && mNtpSearchBoxScrollPercent != UNINITIALIZED_PERCENT) {
@@ skipping 36 matching lines @@
         }
         return showAccessibilityToast(v, description);
     }
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         if (!mDisableLocationBarRelayout) {
             super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
             boolean changed = layoutLocationBar(MeasureSpec.getSize(widthMeasureSpec));
-            if (!mInTabSwitcherMode) setUrlFocusChangePercent(mUrlFocusChangePercent);
+            if (!mIsInTabSwitcherMode) setUrlFocusChangePercent(mUrlFocusChangePercent);
             if (!changed) return;
         } else {
             updateUnfocusedLocationBarLayoutParams();
         }
 
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
 
     private void updateUnfocusedLocationBarLayoutParams() {
         boolean hasVisibleViewPriorToUrlBar = false;
@@ skipping 250 matching lines @@
         updateUrlExpansionAnimation();
     }
 
     private void updateUrlExpansionPercent() {
         mUrlExpansionPercent = Math.max(mNtpSearchBoxScrollPercent, mUrlFocusChangePercent);
         assert mUrlExpansionPercent >= 0;
         assert mUrlExpansionPercent <= 1;
     }
 
     private void updateUrlExpansionAnimation() {
-        if (mInTabSwitcherMode || isTabSwitcherAnimationRunning()) return;
+        if (mIsInTabSwitcherMode || isTabSwitcherAnimationRunning()) return;
 
         mLocationBarBackgroundOffset.setEmpty();
 
         FrameLayout.LayoutParams locationBarLayoutParams =
                 getFrameLayoutParams(mPhoneLocationBar);
         int currentLeftMargin = locationBarLayoutParams.leftMargin;
         int currentWidth = locationBarLayoutParams.width;
 
         float inversePercent = 1f - mUrlExpansionPercent;
         boolean isLocationBarRtl = ApiCompatibilityUtils.isLayoutRtl(mPhoneLocationBar);
@@ skipping 64 matching lines @@
                 || (mUnfocusedLocationBarUsesTransparentBg
                         && !mUrlFocusChangeInProgress
                         && !mPhoneLocationBar.hasFocus())
                         ? LOCATION_BAR_TRANSPARENT_BACKGROUND_ALPHA : 255;
         setAncestorsShouldClipChildren(true);
         mNtpSearchBoxScrollPercent = UNINITIALIZED_PERCENT;
         updateUrlExpansionPercent();
     }
 
     private void updateNtpTransitionAnimation(NewTabPage ntp) {
-        if (mInTabSwitcherMode) return;
+        if (mIsInTabSwitcherMode) return;
 
         setAncestorsShouldClipChildren(mUrlExpansionPercent == 0f);
         mToolbarShadow.setAlpha(0f);
 
         float growthPercent = 0f;
         if (mUrlExpansionPercent == 0f || mUrlExpansionPercent == 1f) {
             growthPercent = 1f - mUrlExpansionPercent;
         } else {
             // During the transition from search box to omnibox, keep the omnibox drawing
             // at the same size of the search box for first 40% of the scroll transition.
@@ skipping 121 matching lines @@
             canvas.translate(backgroundLeft, backgroundTop);
 
             mTabSwitcherAnimationTabStackDrawable.setAlpha(rgbAlpha);
             mTabSwitcherAnimationTabStackDrawable.draw(canvas);
             canvas.restore();
         }
 
         // Draw the menu button if necessary.
         if (mTabSwitcherAnimationMenuDrawable != null
                 && mUrlExpansionPercent != 1f) {
+            canvas.save();
             mTabSwitcherAnimationMenuDrawable.setBounds(
                     mMenuButton.getPaddingLeft(), mMenuButton.getPaddingTop(),
                     mMenuButton.getWidth() - mMenuButton.getPaddingRight(),
                     mMenuButton.getHeight() - mMenuButton.getPaddingBottom());
             translateCanvasToView(mToolbarButtonsContainer, mMenuButton, canvas);
             mTabSwitcherAnimationMenuDrawable.setAlpha(rgbAlpha);
             int color = mUseLightToolbarDrawables
                     ? mLightModeDefaultColor
                     : mDarkModeDefaultColor;
             mTabSwitcherAnimationMenuDrawable.setColorFilter(color, PorterDuff.Mode.SRC_IN);
             mTabSwitcherAnimationMenuDrawable.draw(canvas);
+            canvas.restore();
+        }
+
+        // Draw the menu badge if necessary.
+        if (mShowMenuBadge && mTabSwitcherAnimationMenuBadgeDrawable != null
+                && mUrlExpansionPercent != 1f) {
+            translateCanvasToView(mToolbarButtonsContainer, mMenuBadge, canvas);
+            mTabSwitcherAnimationMenuBadgeDrawable.setAlpha(rgbAlpha);
+            mTabSwitcherAnimationMenuBadgeDrawable.draw(canvas);
         }
 
         canvas.restore();
     }
 
     @Override
     public void doInvalidate() {
         postInvalidateOnAnimation();
     }
 
@@ skipping 18 matching lines @@
             to = (View) to.getParent();
         }
     }
 
     @Override
     protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
         if (child == mPhoneLocationBar) return drawLocationBar(canvas, drawingTime);
         boolean clipped = false;
 
         if (mLocationBarBackground != null
-                && ((!mInTabSwitcherMode && !mTabSwitcherModeViews.contains(child))
-                        || (mInTabSwitcherMode && mBrowsingModeViews.contains(child)))) {
+                && ((!mIsInTabSwitcherMode && !mTabSwitcherModeViews.contains(child))
+                        || (mIsInTabSwitcherMode && mBrowsingModeViews.contains(child)))) {
             canvas.save();
             if (mUrlExpansionPercent != 0f && mUrlViewportBounds.top < child.getBottom()) {
                 // For other child views, use the inverse clipping of the URL viewport.
                 // Only necessary during animations.
                 // Hardware mode does not support unioned clip regions, so clip using the
                 // appropriate bounds based on whether the child is to the left or right of the
                 // location bar.
                 boolean isLeft = (child == mNewTabButton || child == mHomeButton)
                         ^ LocalizationUtils.isLayoutRtl();
 
@@ skipping 24 matching lines @@
         return retVal;
     }
 
     private boolean drawLocationBar(Canvas canvas, long drawingTime) {
         boolean clipped = false;
         float locationBarClipLeft = 0;
         float locationBarClipRight = 0;
         float locationBarClipTop = 0;
         float locationBarClipBottom = 0;
 
-        if (mLocationBarBackground != null && (!mInTabSwitcherMode || mTextureCaptureMode)) {
+        if (mLocationBarBackground != null && (!mIsInTabSwitcherMode || mTextureCaptureMode)) {
             canvas.save();
             int backgroundAlpha = mUrlBackgroundAlpha;
             if (mTabSwitcherModeAnimation != null) {
                 // Fade out/in the location bar towards the beginning of the animations to avoid
                 // large jumps of stark white.
                 backgroundAlpha =
                         (int) (Math.pow(mPhoneLocationBar.getAlpha(), 3) * backgroundAlpha);
             } else if (getToolbarDataProvider().isUsingBrandColor()
                     && !mBrandColorTransitionActive) {
                 int unfocusedAlpha = mUnfocusedLocationBarUsesTransparentBg
@@ skipping 86 matching lines @@
         }
     }
 
     @Override
     public void onStateRestored() {
         if (mToggleTabStackButton != null) mToggleTabStackButton.setClickable(true);
     }
 
     @Override
     public boolean isReadyForTextureCapture() {
-        return !(mInTabSwitcherMode || mTabSwitcherModeAnimation != null
+        return !(mIsInTabSwitcherMode || mTabSwitcherModeAnimation != null
                 || urlHasFocus() || mUrlFocusChangeInProgress);
     }
 
     @Override
     protected void onNavigatedToDifferentPage() {
         super.onNavigatedToDifferentPage();
         if (FeatureUtilities.isDocumentMode(getContext())) {
             mUrlContainer.setTrailingTextVisible(true);
         }
     }
@@ skipping 31 matching lines @@
 
         outRect.set(outRect.left + paddingLeft,
                 outRect.top + paddingTop,
                 outRect.right - paddingRight,
                 outRect.bottom - paddingBottom);
     }
 
     @Override
     protected void onHomeButtonUpdate(boolean homeButtonEnabled) {
         if (homeButtonEnabled) {
-            mHomeButton.setVisibility(urlHasFocus() || mInTabSwitcherMode ? INVISIBLE : VISIBLE);
+            mHomeButton.setVisibility(urlHasFocus() || mIsInTabSwitcherMode ? INVISIBLE : VISIBLE);
             if (!mBrowsingModeViews.contains(mHomeButton)) {
                 mBrowsingModeViews.add(mHomeButton);
             }
         } else {
             mHomeButton.setVisibility(GONE);
             mBrowsingModeViews.remove(mHomeButton);
         }
     }
 
     private ObjectAnimator createEnterTabSwitcherModeAnimation() {
@@ skipping 18 matching lines @@
             final boolean animateNormalToolbar) {
         ObjectAnimator exitAnimation =
                 ObjectAnimator.ofFloat(this, mTabSwitcherModePercentProperty, 0.f);
         exitAnimation.setDuration(animateNormalToolbar
                 ? TAB_SWITCHER_MODE_EXIT_NORMAL_ANIMATION_DURATION_MS
                 : TAB_SWITCHER_MODE_EXIT_FADE_ANIMATION_DURATION_MS);
         exitAnimation.setInterpolator(new LinearInterpolator());
         exitAnimation.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
-                updateViewsForTabSwitcherMode(mInTabSwitcherMode);
+                updateViewsForTabSwitcherMode(mIsInTabSwitcherMode);
             }
         });
 
         return exitAnimation;
     }
 
     private ObjectAnimator createPostExitTabSwitcherAnimation() {
         ObjectAnimator exitAnimation = ObjectAnimator.ofFloat(
                 this, View.TRANSLATION_Y, -getHeight(), 0.f);
         exitAnimation.setDuration(TAB_SWITCHER_MODE_POST_EXIT_ANIMATION_DURATION_MS);
         exitAnimation.setInterpolator(BakedBezierInterpolator.TRANSFORM_CURVE);
         exitAnimation.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
-                updateViewsForTabSwitcherMode(mInTabSwitcherMode);
+                updateViewsForTabSwitcherMode(mIsInTabSwitcherMode);
                 // On older builds, force an update to ensure the new visuals are used
                 // when bringing in the toolbar.  crbug.com/404571
                 if (Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN) {
                     requestLayout();
                 }
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
                 mDelayedTabSwitcherModeAnimation = null;
-                updateShadowVisibility(mInTabSwitcherMode);
-                updateViewsForTabSwitcherMode(mInTabSwitcherMode);
+                updateShadowVisibility(mIsInTabSwitcherMode);
+                updateViewsForTabSwitcherMode(mIsInTabSwitcherMode);
             }
         });
 
         return exitAnimation;
     }
 
     @Override
     public void setTextureCaptureMode(boolean textureMode) {
         assert mTextureCaptureMode != textureMode;
         mTextureCaptureMode = textureMode;
@@ skipping 24 matching lines @@
             view.setVisibility(browsingViewsVisibility);
         }
         getProgressBar().setVisibility(
                 isInTabSwitcherMode || isTabSwitcherAnimationRunning() ? INVISIBLE : VISIBLE);
         updateVisualsForToolbarState(isInTabSwitcherMode);
 
     }
 
     @Override
     protected void setContentAttached(boolean attached) {
-        updateVisualsForToolbarState(mInTabSwitcherMode);
+        updateVisualsForToolbarState(mIsInTabSwitcherMode);
     }
 
     @Override
     protected void setTabSwitcherMode(
             boolean inTabSwitcherMode, boolean showToolbar, boolean delayAnimation) {
-        if (mInTabSwitcherMode == inTabSwitcherMode) return;
+        if (mIsInTabSwitcherMode == inTabSwitcherMode) return;
 
         finishAnimations();
 
         mDelayingTabSwitcherAnimation = delayAnimation;
 
         if (inTabSwitcherMode) {
             if (mUrlFocusLayoutAnimator != null && mUrlFocusLayoutAnimator.isRunning()) {
                 mUrlFocusLayoutAnimator.end();
                 mUrlFocusLayoutAnimator = null;
                 // After finishing the animation, force a re-layout of the location bar,
                 // so that the final translation position is correct (since onMeasure updates
                 // won't happen in tab switcher mode). crbug.com/518795.
                 layoutLocationBar(getMeasuredWidth());
                 updateUrlExpansionAnimation();
             }
             mNewTabButton.setEnabled(true);
             updateViewsForTabSwitcherMode(true);
             mTabSwitcherModeAnimation = createEnterTabSwitcherModeAnimation();
         } else {
             if (!mDelayingTabSwitcherAnimation) {
                 mTabSwitcherModeAnimation = createExitTabSwitcherAnimation(showToolbar);
             }
             mUIAnimatingTabSwitcherTransition = true;
         }
 
         mAnimateNormalToolbar = showToolbar;
-        mInTabSwitcherMode = inTabSwitcherMode;
+        mIsInTabSwitcherMode = inTabSwitcherMode;
         if (mTabSwitcherModeAnimation != null) mTabSwitcherModeAnimation.start();
 
         if (SysUtils.isLowEndDevice()) finishAnimations();
 
         postInvalidateOnAnimation();
     }
 
     @Override
     protected void onTabSwitcherTransitionFinished() {
         setAlpha(1.f);
         mClipRect = null;
         mUIAnimatingTabSwitcherTransition = false;
+
+        if (mShowMenuBadge && !mIsInTabSwitcherMode) {
+            // If mInTabSwitcherMode is true, the menu button drawable will be updated in
+            // #updateVisualsForToolbarState().
+            mMenuButton.setImageBitmap(
+                    UpdateMenuItemHelper.getInstance().getBadgedMenuButtonBitmap(getContext()));
+        }
         if (!mAnimateNormalToolbar) {
             finishAnimations();
-            updateVisualsForToolbarState(mInTabSwitcherMode);
+            updateVisualsForToolbarState(mIsInTabSwitcherMode);
         }
 
         if (mDelayingTabSwitcherAnimation) {
             mDelayingTabSwitcherAnimation = false;
             mDelayedTabSwitcherModeAnimation = createPostExitTabSwitcherAnimation();
             mDelayedTabSwitcherModeAnimation.start();
         } else {
-            updateViewsForTabSwitcherMode(mInTabSwitcherMode);
+            updateViewsForTabSwitcherMode(mIsInTabSwitcherMode);
         }
     }
 
     private void updateOverlayDrawables() {
         if (!isNativeLibraryReady()) return;
 
         VisualState overlayState = computeVisualState(false);
         boolean visualStateChanged = mOverlayDrawablesVisualState != overlayState;
 
         if (!visualStateChanged && mVisualState == VisualState.BRAND_COLOR
                 && getToolbarDataProvider().getPrimaryColor()
                         != mTabSwitcherAnimationBgOverlay.getColor()) {
             visualStateChanged = true;
         }
         if (!visualStateChanged) return;
 
         mOverlayDrawablesVisualState = overlayState;
         mTabSwitcherAnimationBgOverlay.setColor(getToolbarColorForVisualState(
                 mOverlayDrawablesVisualState));
 
-        if (shouldShowMenuButton()) {
-            Resources res = getResources();
-            mTabSwitcherAnimationMenuDrawable = ApiCompatibilityUtils.getDrawable(
-                    res, R.drawable.btn_menu).mutate();
-            mTabSwitcherAnimationMenuDrawable.setColorFilter(
-                    isIncognito() ? mLightModeDefaultColor : mDarkModeDefaultColor,
-                    PorterDuff.Mode.SRC_IN);
-            ((BitmapDrawable) mTabSwitcherAnimationMenuDrawable).setGravity(Gravity.CENTER);
-        }
+        setTabSwitcherAnimationMenuDrawable();
     }
 
     @Override
     public void setOnTabSwitcherClickHandler(OnClickListener listener) {
         mTabSwitcherListener = listener;
     }
 
     @Override
     public void setOnNewTabClickHandler(OnClickListener listener) {
         mNewTabListener = listener;
@@ skipping 49 matching lines @@
             animator.setInterpolator(BakedBezierInterpolator.TRANSFORM_CURVE);
             animators.add(animator);
         }
 
         float density = getContext().getResources().getDisplayMetrics().density;
         boolean isRtl = ApiCompatibilityUtils.isLayoutRtl(this);
         float toolbarButtonTranslationX = MathUtils.flipSignIf(
                 URL_FOCUS_TOOLBAR_BUTTONS_TRANSLATION_X_DP, isRtl) * density;
 
         animator = ObjectAnimator.ofFloat(
-                mMenuButton, TRANSLATION_X, toolbarButtonTranslationX);
+                mMenuButtonWrapper, TRANSLATION_X, toolbarButtonTranslationX);
         animator.setDuration(URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS);
         animator.setInterpolator(BakedBezierInterpolator.FADE_OUT_CURVE);
         animators.add(animator);
 
-        animator = ObjectAnimator.ofFloat(mMenuButton, ALPHA, 0);
+        animator = ObjectAnimator.ofFloat(mMenuButtonWrapper, ALPHA, 0);
         animator.setDuration(URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS);
         animator.setInterpolator(BakedBezierInterpolator.FADE_OUT_CURVE);
         animators.add(animator);
 
         if (mToggleTabStackButton != null) {
             animator = ObjectAnimator.ofFloat(
                     mToggleTabStackButton, TRANSLATION_X, toolbarButtonTranslationX);
             animator.setDuration(URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS);
             animator.setInterpolator(BakedBezierInterpolator.FADE_OUT_CURVE);
             animators.add(animator);
 
             animator = ObjectAnimator.ofFloat(mToggleTabStackButton, ALPHA, 0);
             animator.setDuration(URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS);
             animator.setInterpolator(BakedBezierInterpolator.FADE_OUT_CURVE);
             animators.add(animator);
         }
     }
 
     private void populateUrlClearFocusingAnimatorSet(List<Animator> animators) {
         Animator animator = ObjectAnimator.ofFloat(this, mUrlFocusChangePercentProperty, 0f);
         animator.setDuration(URL_FOCUS_CHANGE_ANIMATION_DURATION_MS);
         animator.setInterpolator(BakedBezierInterpolator.TRANSFORM_CURVE);
         animators.add(animator);
 
-        animator = ObjectAnimator.ofFloat(mMenuButton, TRANSLATION_X, 0);
+        animator = ObjectAnimator.ofFloat(mMenuButtonWrapper, TRANSLATION_X, 0);
         animator.setDuration(URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS);
         animator.setStartDelay(URL_CLEAR_FOCUS_MENU_DELAY_MS);
         animator.setInterpolator(BakedBezierInterpolator.TRANSFORM_CURVE);
         animators.add(animator);
 
-        animator = ObjectAnimator.ofFloat(mMenuButton, ALPHA, 1);
+        animator = ObjectAnimator.ofFloat(mMenuButtonWrapper, ALPHA, 1);
         animator.setDuration(URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS);
         animator.setStartDelay(URL_CLEAR_FOCUS_MENU_DELAY_MS);
         animator.setInterpolator(BakedBezierInterpolator.TRANSFORM_CURVE);
         animators.add(animator);
 
         if (mToggleTabStackButton != null) {
             animator = ObjectAnimator.ofFloat(mToggleTabStackButton, TRANSLATION_X, 0);
             animator.setDuration(URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS);
             animator.setStartDelay(URL_CLEAR_FOCUS_TABSTACK_DELAY_MS);
             animator.setInterpolator(BakedBezierInterpolator.TRANSFORM_CURVE);
@@ skipping 150 matching lines @@
         if (mTabSwitcherAnimationTabStackDrawable != null) {
             mTabSwitcherAnimationTabStackDrawable.updateForTabCount(
                     numberOfTabs, isIncognito());
         }
     }
 
     @Override
     protected void onTabContentViewChanged() {
         super.onTabContentViewChanged();
         updateNtpAnimationState();
-        updateVisualsForToolbarState(mInTabSwitcherMode);
+        updateVisualsForToolbarState(mIsInTabSwitcherMode);
     }
 
     @Override
     protected void onTabOrModelChanged() {
         super.onTabOrModelChanged();
         updateNtpAnimationState();
-        updateVisualsForToolbarState(mInTabSwitcherMode);
+        updateVisualsForToolbarState(mIsInTabSwitcherMode);
     }
 
     private static boolean isVisualStateValidForBrandColorTransition(VisualState state) {
         return state == VisualState.NORMAL || state == VisualState.BRAND_COLOR;
     }
 
     @Override
     protected void onPrimaryColorChanged(boolean shouldAnimate) {
         super.onPrimaryColorChanged(shouldAnimate);
         if (mBrandColorTransitionActive) mBrandColorTransitionAnimation.cancel();
@@ skipping 25 matching lines @@
                     mUrlBackgroundAlpha =
                             (int) (initialAlpha + fraction * (finalAlpha - initialAlpha));
                 }
                 updateToolbarBackground(Color.rgb(red, green, blue));
             }
         });
         mBrandColorTransitionAnimation.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
                 mBrandColorTransitionActive = false;
-                updateVisualsForToolbarState(mInTabSwitcherMode);
+                updateVisualsForToolbarState(mIsInTabSwitcherMode);
             }
         });
         mBrandColorTransitionAnimation.start();
         mBrandColorTransitionActive = true;
     }
 
     private void updateNtpAnimationState() {
         // Store previous NTP scroll before calling reset as that clears this value.
         boolean wasShowingNtp = mVisibleNewTabPage != null;
         float previousNtpScrollPercent = mNtpSearchBoxScrollPercent;
 
         resetNtpAnimationValues();
         if (mVisibleNewTabPage != null) {
             mVisibleNewTabPage.setSearchBoxScrollListener(null);
             mVisibleNewTabPage = null;
         }
         mVisibleNewTabPage = getToolbarDataProvider().getNewTabPageForCurrentTab();
         if (mVisibleNewTabPage != null && mVisibleNewTabPage.isLocationBarShownInNTP()) {
             mVisibleNewTabPage.setSearchBoxScrollListener(this);
             requestLayout();
         } else if (wasShowingNtp) {
             // Convert the previous NTP scroll percentage to URL focus percentage because that
             // will give a nicer transition animation from the expanded NTP omnibox to the
             // collapsed normal omnibox on other non-NTP pages.
-            if (!mInTabSwitcherMode && previousNtpScrollPercent > 0f) {
+            if (!mIsInTabSwitcherMode && previousNtpScrollPercent > 0f) {
                 mUrlFocusChangePercent =
                         Math.max(previousNtpScrollPercent, mUrlFocusChangePercent);
                 triggerUrlFocusAnimation(false);
             }
             requestLayout();
         }
     }
 
     @Override
     protected void onDefaultSearchEngineChanged() {
         super.onDefaultSearchEngineChanged();
         // Post an update for the toolbar state, which will allow all other listeners
         // for the search engine change to update before we check on the state of the
         // world for a UI update.
         // TODO(tedchoc): Move away from updating based on the search engine change and instead
         //                add the toolbar as a listener to the NewTabPage and udpate only when
         //                it notifies the listeners that it has changed its state.
         post(new Runnable() {
             @Override
             public void run() {
-                updateVisualsForToolbarState(mInTabSwitcherMode);
+                updateVisualsForToolbarState(mIsInTabSwitcherMode);
                 updateNtpAnimationState();
             }
         });
     }
 
     @Override
     protected void handleFindToolbarStateChange(boolean showing) {
         setVisibility(showing ? View.GONE : View.VISIBLE);
         TransitionDrawable shadowDrawable = (TransitionDrawable) mToolbarShadow.getDrawable();
         if (showing) {
@@ skipping 100 matching lines @@
                     ColorUtils.getLightProgressbarBackground(currentPrimaryColor);
         }
 
         getProgressBar().setBackgroundColor(progressBarBackgroundColor);
         int progressBarForegroundColor = ApiCompatibilityUtils.getColor(getResources(),
                 mUseLightToolbarDrawables
                 ? R.color.progress_bar_foreground_white
                 : R.color.progress_bar_foreground);
         getProgressBar().setForegroundColor(progressBarForegroundColor);
 
-
         if (mToggleTabStackButton != null) {
             mToggleTabStackButton.setImageDrawable(mUseLightToolbarDrawables
                     ? mTabSwitcherButtonDrawableLight : mTabSwitcherButtonDrawable);
             if (mTabSwitcherAnimationTabStackDrawable != null) {
                 mTabSwitcherAnimationTabStackDrawable.setTint(
                         mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint);
             }
         }
 
         if (shouldShowMenuButton()) {
+            // Only change the menu button drawable if isInTabSwitcherMode to avoid changing
+            // it too soon if we're in the process of existing tab switcher mode. The drawable
+            // will be changed in #onTabSwitcherTransitionFinished if we are exiting tab switcher
+            // mode.
+            if (mShowMenuBadge && isInTabSwitcherMode) {
+                mMenuButton.setImageDrawable(mUnbadgedMenuButtonDrawable);
+            }
             mMenuButton.setTint(mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint);
         }
         if (mHomeButton.getVisibility() != GONE) {
             mHomeButton.setTint(mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint);
         }
 
         mPhoneLocationBar.updateVisualsForState();
         // Remove the side padding for incognito to ensure the badge icon aligns correctly with the
         // background of the location bar.
         if (isIncognito) {
@@ skipping 15 matching lines @@
         if (isInTabSwitcherMode) mNewTabButton.setIsIncognito(isIncognito);
 
         CharSequence newTabContentDescription = getResources().getText(
                 isIncognito ? R.string.accessibility_toolbar_btn_new_incognito_tab :
                         R.string.accessibility_toolbar_btn_new_tab);
         if (mNewTabButton != null
                 && !newTabContentDescription.equals(mNewTabButton.getContentDescription())) {
             mNewTabButton.setContentDescription(newTabContentDescription);
         }
 
-        getMenuButton().setVisibility(shouldShowMenuButton() ? View.VISIBLE : View.GONE);
+        getMenuButtonWrapper().setVisibility(shouldShowMenuButton() ? View.VISIBLE : View.GONE);
     }
 
     @Override
     public LocationBar getLocationBar() {
         return mPhoneLocationBar;
     }
+
+    @Override
+    public void showAppMenuUpdateBadge() {
+        super.showAppMenuUpdateBadge();
+        // Set up variables.
+        if (!mBrowsingModeViews.contains(mMenuBadge)) {
+            mBrowsingModeViews.add(mMenuBadge);
+        }
+
+        // Finish any in-progress animations and set the TabSwitcherAnimationMenuDrawable.
+        finishAnimations();
+        setTabSwitcherAnimationMenuDrawable();
+
+        // Show the badge and update the menu button drawable.
+        if (!mIsInTabSwitcherMode) {
+            setAppMenuUpdateBadgeToVisible();
+        }
+
+        mPhoneLocationBar.showAppMenuUpdateBadge();
+    }
+
+    @Override
+    public void removeAppMenuUpdateBadge() {
+        super.removeAppMenuUpdateBadge();
+        mPhoneLocationBar.removeAppMenuUpdateBadge();
+    }
+
+    private void setTabSwitcherAnimationMenuDrawable() {
+        if (!shouldShowMenuButton()) return;
+        Resources res = getResources();
+        if (mShowMenuBadge) {
+            mTabSwitcherAnimationMenuDrawable = new BitmapDrawable(res,
+                    UpdateMenuItemHelper.getInstance().getBadgedMenuButtonBitmap(getContext()));
+            mTabSwitcherAnimationMenuBadgeDrawable = mMenuBadge.getDrawable().mutate();
+        } else {
+            mTabSwitcherAnimationMenuDrawable = ApiCompatibilityUtils.getDrawable(getResources(),
+                    R.drawable.btn_menu);
+        }
+        mTabSwitcherAnimationMenuDrawable.mutate();
+        mTabSwitcherAnimationMenuDrawable.setColorFilter(
+                isIncognito() ? mLightModeDefaultColor : mDarkModeDefaultColor,
+                PorterDuff.Mode.SRC_IN);
+        ((BitmapDrawable) mTabSwitcherAnimationMenuDrawable).setGravity(Gravity.CENTER);
+    }
 }