[TTS] Hide In-Product Help BarBanner on second trigger

This CL hides the BarBanner with an animation if it is triggered
while already showing.

Bug: 786459
Change-Id: I252dbad91ebbcca0ce1e7449e556a3e74cc1109a
Reviewed-on: https://chromium-review.googlesource.com/803906Reviewed-by: Donn Denman <donnd@chromium.org>
Commit-Queue: Mehran Mahmoudi <mahmoudi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521160}

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchBarBannerControl.java

@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.browser.compositor.bottombar.contextualsearch;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
 import android.view.ViewGroup;
 
@@ -30,6 +32,11 @@ public class ContextualSearchBarBannerControl extends OverlayPanelInflater {
      */
     private boolean mIsVisible;
 
+    /**
+     * Whether the Bar Banner is in the process of hiding.
+     */
+    private boolean mIsHiding;
+
     /**
      * The height of the Bar Banner, in pixels.
      */
@@ -111,15 +118,18 @@ public class ContextualSearchBarBannerControl extends OverlayPanelInflater {
     void hide() {
         if (!mIsVisible) return;
 
+        if (mHeightPx == 0.f) {
             mIsVisible = false;
-        mHeightPx = 0.f;
+        } else {
+            animateDisappearance();
+        }
     }
 
     /**
      * @return The height of the Bar Banner when the Panel is the peeked state.
      */
     float getHeightPeekingPx() {
-        return mIsVisible ? getPaddedHeightPx() : 0.f;
+        return (!isVisible() || mIsHiding) ? 0.f : getPaddedHeightPx();
     }
 
     /** Calculates the padded height of the bar banner if it has not been calculated before.
@@ -204,7 +214,7 @@ public class ContextualSearchBarBannerControl extends OverlayPanelInflater {
      * @param percentage The completion percentage.
      */
     public void onUpdateFromCloseToPeek(float percentage) {
-        if (!isVisible()) return;
+        if (!isVisible() || mIsHiding) return;
 
         mHeightPx = Math.round(getPaddedHeightPx());
     }
@@ -215,7 +225,7 @@ public class ContextualSearchBarBannerControl extends OverlayPanelInflater {
      * @param percentage The completion percentage.
      */
     public void onUpdateFromPeekToExpand(float percentage) {
-        if (!isVisible()) return;
+        if (!isVisible() || mIsHiding) return;
 
         mHeightPx = Math.round(MathUtils.interpolate(getPaddedHeightPx(), 0.f, percentage));
         mTextOpacity = MathUtils.interpolate(1.f, 0.f, percentage);
@@ -227,7 +237,7 @@ public class ContextualSearchBarBannerControl extends OverlayPanelInflater {
      * @param percentage The completion percentage.
      */
     public void onUpdateFromExpandToMaximize(float percentage) {
-        if (!isVisible()) return;
+        if (!isVisible() || mIsHiding) return;
 
         mHeightPx = 0.f;
         mTextOpacity = 0.f;
@@ -262,4 +272,32 @@ public class ContextualSearchBarBannerControl extends OverlayPanelInflater {
                         OverlayPanelAnimation.BASE_ANIMATION_DURATION_MS, listener);
         appearance.start();
     }
+
+    /**
+     * Animates the Bar Banner disappearance.
+     */
+    private void animateDisappearance() {
+        mIsHiding = true;
+        CompositorAnimator disappearance =
+                CompositorAnimator.ofFloat(mOverlayPanel.getAnimationHandler(), 1.f, 0.f,
+                        OverlayPanelAnimation.BASE_ANIMATION_DURATION_MS, null);
+        disappearance.addUpdateListener(new AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(CompositorAnimator animator) {
+                if (isVisible()) {
+                    float percentage = animator.getAnimatedFraction();
+                    mHeightPx = MathUtils.interpolate(getPaddedHeightPx(), 0.f, percentage);
+                }
+            }
+        });
+        disappearance.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mHeightPx = 0.f;
+                mIsHiding = false;
+                hide();
+            }
+        });
+        disappearance.start();
+    }
 }
\ No newline at end of file

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchIPH.java

@@ -29,7 +29,7 @@ public class ContextualSearchIPH {
     private boolean mIsShowing;
 
     /**
-     * Constructs the helper class and initializes string ids according to featureName.
+     * Constructs the helper class.
      */
     ContextualSearchIPH() {}
 
@@ -55,9 +55,15 @@ public class ContextualSearchIPH {
      */
     void beforePanelShown(boolean wasActivatedByTap, boolean isTapSupported, Profile profile) {
         if (!wasActivatedByTap && isTapSupported) {
+            if (mIsShowing
+                    && mFeatureName.equals(
+                               FeatureConstants.CONTEXTUAL_SEARCH_PROMOTE_TAP_FEATURE)) {
+                dismiss(profile);
+            } else {
                 maybeShow(FeatureConstants.CONTEXTUAL_SEARCH_PROMOTE_TAP_FEATURE, profile);
             }
         }
+    }
 
     /**
      * Called after the Contextual Search panel's animation is finished.