Replace update menu badge

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.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.omnibox;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.text.Selection;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
@@ skipping 31 matching lines @@
     private TintedImageButton mMenuButton;
     private ImageView mMenuBadge;
     private View mMenuButtonWrapper;
     private int mIncognitoBadgePadding;
     private boolean mVoiceSearchEnabled;
     private boolean mUrlFocusChangeInProgress;
     private float mUrlFocusChangePercent;
     private Runnable mKeyboardResizeModeTask;
     private ObjectAnimator mOmniboxBackgroundAnimator;
 
+    private boolean mShowMenuBadge;
+    private AnimatorSet mMenuBadgeAnimatorSet;
+    private boolean mIsMenuBadgeAnimationRunning;
+
     /**
      * Constructor used to inflate from XML.
      */
     public LocationBarPhone(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
@@ skipping 275 matching lines @@
     @Override
     public void updateVisualsForState() {
         super.updateVisualsForState();
 
         Tab tab = getCurrentTab();
         boolean isIncognito = tab != null && tab.isIncognito();
         mIncognitoBadge.setVisibility(isIncognito ? VISIBLE : GONE);
         updateIncognitoBadgePadding();
 
         if (showMenuButtonInOmnibox()) {
-            boolean useLightDrawables = isIncognito;
-            if (getToolbarDataProvider().isUsingBrandColor()) {
-                int currentPrimaryColor = getToolbarDataProvider().getPrimaryColor();
-                useLightDrawables |=
-                        ColorUtils.shoudUseLightForegroundOnBackground(currentPrimaryColor);
-            }
+            boolean useLightDrawables = shouldUseLightDrawables();
             ColorStateList dark = ApiCompatibilityUtils.getColorStateList(getResources(),
                     R.color.dark_mode_tint);
             ColorStateList white = ApiCompatibilityUtils.getColorStateList(getResources(),
                     R.color.light_mode_tint);
             mMenuButton.setTint(useLightDrawables ? white : dark);
+
+            if (mShowMenuBadge) {
+                mMenuBadge.setImageResource(useLightDrawables ? R.drawable.badge_update_light
+                        : R.drawable.badge_update_dark);
+            }
         }
     }
 
     @Override
     protected boolean shouldAnimateIconChanges() {
         return super.shouldAnimateIconChanges() || mUrlFocusChangeInProgress;
     }
 
     @Override
     public void setLayoutDirection(int layoutDirection) {
         super.setLayoutDirection(layoutDirection);
         updateIncognitoBadgePadding();
     }
 
     /**
      * Displays the update app menu badge.
      */
-    public void showAppMenuUpdateBadge() {
+    public void showAppMenuUpdateBadge(boolean animate) {
+        if (!showMenuButtonInOmnibox()) return;
+
+        mShowMenuBadge = true;
+        if (shouldUseLightDrawables()) {
+            mMenuBadge.setImageResource(R.drawable.badge_update_light);

[gone, 2016/02/13 00:26:15]

Maybe this should mimic what's above, where it uses the ternary operator? 
Barring that, add a comment saying the default is dark.

[Theresa, 2016/02/16 18:21:53]

Done.

+        }
+
+        if (!animate || mIsMenuBadgeAnimationRunning) {
+            mMenuBadge.setVisibility(View.VISIBLE);
+            return;
+        }
+
+        // Set initial states.
+        mMenuBadge.setAlpha(0.f);
         mMenuBadge.setVisibility(View.VISIBLE);
-        mMenuButton.setImageBitmap(
-                UpdateMenuItemHelper.getInstance().getBadgedMenuButtonBitmap(getContext()));
+
+        mMenuBadgeAnimatorSet = UpdateMenuItemHelper.createShowUpdateBadgeAnimation(
+                mMenuButton, mMenuBadge);
+
+        mMenuBadgeAnimatorSet.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                mIsMenuBadgeAnimationRunning = true;
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mIsMenuBadgeAnimationRunning = false;
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+                mIsMenuBadgeAnimationRunning = false;
+            }
+        });
+
+        mMenuBadgeAnimatorSet.start();
     }
 
     /**
      * Remove the update menu app menu badge.
      */
-    public void removeAppMenuUpdateBadge() {
-        mMenuBadge.setVisibility(View.GONE);
+    public void removeAppMenuUpdateBadge(boolean animate) {
+        boolean wasShowingMenuBadge = mShowMenuBadge;
+        mShowMenuBadge = false;
+        if (!animate || !wasShowingMenuBadge) {
+            if (!mIsMenuBadgeAnimationRunning && showMenuButtonInOmnibox()) {

[Theresa, 2016/02/16 18:21:53]

To document this change from patchset 3, if the animation to show the badge is
running when a call to remove the badge comes in (e.g. open the overlow menu
while the animation to show the badge is running), I think we should just remove
the badge (visibility == gone), rather than do nothing.

+                mMenuBadge.setVisibility(View.GONE);
+            }
+            return;
+        }
+
+        if (mIsMenuBadgeAnimationRunning) {
+            mMenuBadgeAnimatorSet.cancel();
+        }
+
+        // Set initial states.
+        mMenuButton.setAlpha(0.f);
+
+        mMenuBadgeAnimatorSet = UpdateMenuItemHelper.createHideUpdateBadgeAnimation(
+                mMenuButton, mMenuBadge);
+
+        mMenuBadgeAnimatorSet.addListener(new AnimatorListenerAdapter() {

[gone, 2016/02/13 00:26:15]

Can this be combined with the three other AnimatorListenerAdapters above?  Maybe
with a createBadgeAnimatorListener() or something?

Could you take that even further and avoid duplicating the code, too?  Seems
like the same fields are added to both Toolbar subclasses, e.g., and the code
looks like it does fairly similar things.

[Theresa, 2016/02/16 18:21:53]

LocationBarPhone isn't a Toolbar subclass which is why there's some duplicate
code. As discussed offline, since duplicate code is a result of document mode
and it's disappearing soon anyway, so going to leave it as is.

+            @Override
+            public void onAnimationStart(Animator animation) {
+                mIsMenuBadgeAnimationRunning = true;
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mIsMenuBadgeAnimationRunning = false;
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+                mIsMenuBadgeAnimationRunning = false;
+            }
+        });
+
+        mMenuBadgeAnimatorSet.start();
+    }
+
+    public void cancelAppMenuUpdateBadgeAnimation() {
+        if (mIsMenuBadgeAnimationRunning) {
+            mMenuBadgeAnimatorSet.cancel();
+        }
+    }
+
+    private boolean shouldUseLightDrawables() {
+        Tab tab = getCurrentTab();
+        boolean isIncognito = tab != null && tab.isIncognito();
+        boolean useLightDrawables = isIncognito;
+        if (getToolbarDataProvider().isUsingBrandColor()) {
+            int currentPrimaryColor = getToolbarDataProvider().getPrimaryColor();
+            useLightDrawables |=
+                    ColorUtils.shoudUseLightForegroundOnBackground(currentPrimaryColor);
+        }
+        return useLightDrawables;
     }
 }