Clean up custom tab toolbar ellisizing and animation

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;
-import android.text.TextUtils.TruncateAt;
 import android.util.AttributeSet;
 import android.util.Pair;
 import android.util.TypedValue;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ skipping 332 matching lines @@
         // ImageView#setImageResource is no-op if given resource is the current one.
         mSecurityButton.setImageResource(LocationBarLayout.getSecurityIconResource(
                 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 {
+        } else if (mSecurityButton.getVisibility() != View.VISIBLE) {
             if (mSecurityButtonShowAnimator.isRunning()) mSecurityButtonShowAnimator.cancel();
             mSecurityButtonShowAnimator.start();
             mUrlBar.deEmphasizeUrl();
         }
         mUrlBar.emphasizeUrl();
         mUrlBar.invalidate();
     }
 
     /**
      * For extending classes to override and carry out the changes related with the primary color
@@ skipping 81 matching lines @@
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         updateLayoutParams();
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
 
     @Override
     public LocationBar getLocationBar() {
         return this;
     }
 
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        if (changed) {
-            final int availWidth = mUrlInfoContainer.getMeasuredWidth()
-                    - ApiCompatibilityUtils.getPaddingStart(mTitleBar)
-                    - ApiCompatibilityUtils.getPaddingEnd(mTitleBar);
-            String currentText = mTitleBar.getText().toString();
-            String currentTitle;
-            Tab currentTab = getToolbarDataProvider().getTab();
-            if (currentTab == null || TextUtils.isEmpty(currentTab.getTitle())) {
-                currentTitle = "";
-            } else {
-                currentTitle = currentTab.getTitle();
-            }
-            String ellipsizedText = TextUtils.ellipsize(currentTitle,
-                    mTitleBar.getPaint(), availWidth, TruncateAt.END).toString();
-            if (!ellipsizedText.equals(currentText)) mTitleBar.setText(ellipsizedText);
-        }
-        super.onLayout(changed, left, top, right, bottom);
-    }
-
     // Toolbar and LocationBar calls that are not relevant here.
 
     @Override
     public void setToolbarDataProvider(ToolbarDataProvider model) { }
 
     @Override
     public void onUrlPreFocusChanged(boolean gainFocus) {
     }
 
     @Override
@@ skipping 23 matching lines @@
     public void onTabLoadingNTP(NewTabPage ntp) {
     }
 
     @Override
     public void setAutocompleteProfile(Profile profile) {
     }
 
     @Override
     public void backKeyPressed() { }
 }