Add a slide animation to security lock appearing on a custom tab

chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.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;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.text.TextUtils;
@@ skipping 26 matching lines @@
 import org.chromium.chrome.browser.omnibox.LocationBarLayout;
 import org.chromium.chrome.browser.omnibox.UrlBar;
 import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.ssl.ConnectionSecurityLevel;
 import org.chromium.chrome.browser.tab.ChromeTab;
 import org.chromium.chrome.browser.widget.TintedImageButton;
 import org.chromium.components.dom_distiller.core.DomDistillerService;
 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
 import org.chromium.ui.base.WindowAndroid;
+import org.chromium.ui.interpolators.BakedBezierInterpolator;
 
 /**
  * The Toolbar layout to be used for a custom tab. This is used for both phone and tablet UIs.
  */
 public class CustomTabToolbar extends ToolbarLayout implements LocationBar {
+    private static final int CUSTOM_TAB_TOOLBAR_SLIDE_DURATION_MS = 200;
+    private static final int CUSTOM_TAB_TOOLBAR_FADE_DURATION_MS = 150;
     private View mUrlInfoContainer;
     private UrlBar mUrlBar;
     private TextView mTitleBar;
     private ImageView mSecurityButton;
     private ImageButton mCustomActionButton;
     private int mSecurityIconType;
     private boolean mUseDarkColors;
     private TintedImageButton mCloseButton;
-    private Animator mSecurityButtonShowAnimator;
+
+    private AnimatorSet mSecurityButtonShowAnimator;
     private boolean mBackgroundColorSet;
 
     /**
      * Constructor for getting this class inflated from an xml layout file.
      */
     public CustomTabToolbar(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
         setBackground(new ColorDrawable(getResources().getColor(R.color.default_primary_color)));
         mUrlBar = (UrlBar) findViewById(R.id.url_bar);
         mUrlBar.setHint("");
         mUrlBar.setDelegate(this);
         mUrlBar.setEnabled(false);
         mUrlBar.setAllowFocus(false);
         mTitleBar = (TextView) findViewById(R.id.title_bar);
         mUrlInfoContainer = findViewById(R.id.url_info_container);
         mSecurityButton = (ImageButton) findViewById(R.id.security_button);
         mSecurityIconType = ConnectionSecurityLevel.NONE;
         mCustomActionButton = (ImageButton) findViewById(R.id.action_button);
         mCloseButton = (TintedImageButton) findViewById(R.id.close_button);
-        mSecurityButtonShowAnimator = ObjectAnimator.ofFloat(mSecurityButton, ALPHA, 1);
-        mSecurityButtonShowAnimator
-                .setDuration(ToolbarPhone.URL_FOCUS_CHANGE_ANIMATION_DURATION_MS);
+        populateToolbarAnimations();
+    }
+
+    private void populateToolbarAnimations() {
+        mSecurityButtonShowAnimator = new AnimatorSet();
+        int securityIconButtonWidth =
+                getResources().getDimensionPixelSize(R.dimen.location_bar_icon_width);
+        Animator urlInfoContainerTranslateAnimator =
+                ObjectAnimator.ofFloat(mUrlInfoContainer, TRANSLATION_X, securityIconButtonWidth);
+        urlInfoContainerTranslateAnimator.setInterpolator(BakedBezierInterpolator.TRANSFORM_CURVE);
+        urlInfoContainerTranslateAnimator.setDuration(CUSTOM_TAB_TOOLBAR_SLIDE_DURATION_MS);
+
+        Animator securityButtonAlphaAnimator = ObjectAnimator.ofFloat(mSecurityButton, ALPHA, 1);
+        securityButtonAlphaAnimator.setInterpolator(BakedBezierInterpolator.FADE_IN_CURVE);
+        securityButtonAlphaAnimator.setDuration(CUSTOM_TAB_TOOLBAR_FADE_DURATION_MS);
+        securityButtonAlphaAnimator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                mSecurityButton.setVisibility(VISIBLE);
+                mUrlInfoContainer.setTranslationX(0);
+            }
+        });
+
+        mSecurityButtonShowAnimator.playSequentially(
+                urlInfoContainerTranslateAnimator, securityButtonAlphaAnimator);
     }
 
     @Override
     protected int getToolbarHeightWithoutShadowResId() {
         return R.dimen.custom_tabs_control_container_height;
     }
 
     @Override
     public void initialize(ToolbarDataProvider toolbarDataProvider,
             ToolbarTabController tabController, AppMenuButtonHelper appMenuButtonHelper) {
@@ skipping 232 matching lines @@
                 securityLevel, !shouldEmphasizeHttpsScheme()));
 
         if (mSecurityIconType == securityLevel) return;
         mSecurityIconType = securityLevel;
 
         if (securityLevel == ConnectionSecurityLevel.NONE) {
             // TODO(yusufo): Add an animator for hiding as well.
             mSecurityButton.setVisibility(GONE);
         } else {
             if (mSecurityButtonShowAnimator.isRunning()) mSecurityButtonShowAnimator.cancel();
-            mSecurityButton.setVisibility(VISIBLE);
             mSecurityButtonShowAnimator.start();
             mUrlBar.deEmphasizeUrl();
         }
         mUrlBar.emphasizeUrl();
         mUrlBar.invalidate();
     }
 
     /**
      * For extending classes to override and carry out the changes related with the primary color
      * for the current tab changing.
@@ skipping 144 matching lines @@
     public void onTabLoadingNTP(NewTabPage ntp) {
     }
 
     @Override
     public void setAutocompleteProfile(Profile profile) {
     }
 
     @Override
     public void backKeyPressed() { }
 }