Fix title and url animation for media in CCT

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.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
@@ skipping 91 matching lines @@
         public boolean onTouchEvent(MotionEvent event) {
             mGestureDetector.onTouchEvent(event);
             return super.onTouchEvent(event);
         }
     }
 
     private static final int TITLE_ANIM_DELAY_MS = 800;
     private static final int STATE_DOMAIN_ONLY = 0;
     private static final int STATE_TITLE_ONLY = 1;
     private static final int STATE_DOMAIN_AND_TITLE = 2;
+    private static final int STATE_DOMAIN_AND_TITLE_NO_ANIM = 3;
 
     private View mLocationBarFrameLayout;
     private View mTitleUrlContainer;
     private UrlBar mUrlBar;
     private TextView mTitleBar;
     private TintedImageButton mSecurityButton;
     private ImageButton mCustomActionButton;
     private int mSecurityIconType;
     private ImageButton mCloseButton;
 
@@ skipping 130 matching lines @@
 
     @Override
     public boolean shouldEmphasizeHttpsScheme() {
         int securityLevel = getSecurityLevel();
         return securityLevel == ConnectionSecurityLevel.DANGEROUS
                 || securityLevel == ConnectionSecurityLevel.SECURE_WITH_POLICY_INSTALLED_CERT;
     }
 
     @Override
     public void setShowTitle(boolean showTitle) {
+        if (mState == STATE_DOMAIN_AND_TITLE_NO_ANIM) return;
+
         if (showTitle) {
             mState = STATE_DOMAIN_AND_TITLE;
             mAnimDelegate.prepareTitleAnim(mUrlBar, mTitleBar);
         } else {
             mState = STATE_DOMAIN_ONLY;
         }
     }
 
     @Override
     public void setUrlBarHidden(boolean hideUrlBar) {
@@ skipping 103 matching lines @@
                         DomDistillerUrlUtils.getValueForKeyInUrl(url, "entry_id"));
                 displayText =
                         DomDistillerTabUtils.getFormattedUrlFromOriginalDistillerUrl(originalUrl);
             } else if (DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(url) != null) {
                 String originalUrl = DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(url);
                 displayText =
                         DomDistillerTabUtils.getFormattedUrlFromOriginalDistillerUrl(originalUrl);
             }
         }
 
-        if (mUrlBar.setUrl(url, displayText)) {
+        boolean showUrl = true;
+
+        // For media viewer, title animation is disabled. Hence, set the URL and title bars to their
+        // final size.
+        if (mState == STATE_DOMAIN_AND_TITLE_NO_ANIM) {
+            mUrlBar.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                    getResources().getDimension(R.dimen.custom_tabs_url_text_size));
+            mTitleBar.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                    getResources().getDimension(R.dimen.custom_tabs_title_text_size));
+            mUrlBar.setVisibility(View.VISIBLE);
+            mTitleBar.setVisibility(View.VISIBLE);
+
+            // Show both url and title at the same time, or none if not available yet.
+            if (TextUtils.isEmpty(getCurrentTab().getTitle())) {

[Ian Wen, 2017/01/10 20:04:52]

How can we guarantee that the urlbar will be shown when only the title is
updated later?

+                showUrl = false;
+            }
+        }
+
+        if (showUrl && mUrlBar.setUrl(url, displayText)) {
             mUrlBar.deEmphasizeUrl();
             mUrlBar.emphasizeUrl();
         }
     }
 
     private boolean isStoredArticle(String url) {
         DomDistillerService domDistillerService =
                 DomDistillerServiceFactory.getForProfile(Profile.getLastUsedProfile());
         String entryIdFromUrl = DomDistillerUrlUtils.getValueForKeyInUrl(url, "entry_id");
         if (TextUtils.isEmpty(entryIdFromUrl)) return false;
@@ skipping 23 matching lines @@
             if (!ColorUtils.isUsingDefaultToolbarColor(getResources(),
                     getBackground().getColor())) {
                 getProgressBar().setThemeColor(getBackground().getColor(), false);
             } else {
                 getProgressBar().setBackgroundColor(ApiCompatibilityUtils.getColor(resources,
                         R.color.progress_bar_background));
                 getProgressBar().setForegroundColor(ApiCompatibilityUtils.getColor(resources,
                         R.color.progress_bar_foreground));
             }
         }
+
+        if (mState == STATE_DOMAIN_AND_TITLE_NO_ANIM) {
+            getProgressBar().setVisibility(View.INVISIBLE);
+        }
     }
 
     private void updateButtonsTint() {
         mMenuButton.setTint(mUseDarkColors ? mDarkModeTint : mLightModeTint);
         if (mCloseButton.getDrawable() instanceof TintedDrawable) {
             ((TintedDrawable) mCloseButton.getDrawable()).setTint(
                     mUseDarkColors ? mDarkModeTint : mLightModeTint);
         }
         if (mCustomActionButton.getDrawable() instanceof TintedDrawable) {
             ((TintedDrawable) mCustomActionButton.getDrawable()).setTint(
@@ skipping 40 matching lines @@
     @Override
     public ColorDrawable getBackground() {
         return (ColorDrawable) super.getBackground();
     }
 
     @Override
     public void initializeControls(WindowDelegate windowDelegate, ActionBarDelegate delegate,
             WindowAndroid windowAndroid) {
     }
 
+    public void disableTitleAnimation() {

[Ian Wen, 2017/01/10 20:04:52]

javadoc on public method. Besides, I would move this method above to #272

+        mState = STATE_DOMAIN_AND_TITLE_NO_ANIM;
+    }
+
     private int getSecurityLevel() {
         if (getCurrentTab() == null) return ConnectionSecurityLevel.NONE;
         return getCurrentTab().getSecurityLevel();
     }
 
     @Override
     public void updateSecurityIcon(int securityLevel) {
         if (mState == STATE_TITLE_ONLY) return;
 
         mSecurityIconType = securityLevel;
@@ skipping 256 matching lines @@
 
     @Override
     protected void setAppMenuUpdateBadgeToVisible(boolean animate) {}
 
     @Override
     public View getMenuButtonWrapper() {
         // This class has no menu button wrapper, so return the menu button instead.
         return mMenuButton;
     }
 }