Custom Tabs: Preserve the offline bolt icon when showing an offline page.

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 324 matching lines @@
         super.onNavigatedToDifferentPage();
         setTitleToPageTitle();
         if (mState == STATE_TITLE_ONLY) {
             if (TextUtils.isEmpty(mFirstUrl)) {
                 mFirstUrl = getToolbarDataProvider().getTab().getUrl();
             } else {
                 if (mFirstUrl.equals(getToolbarDataProvider().getTab().getUrl())) return;
                 setUrlBarHidden(false);
             }
         }
-        showOfflineBoltIfNecessary();
+        updateSecurityIcon(getSecurityLevel());
     }
 
     @Override
     public void setUrlToPageUrl() {
         if (getCurrentTab() == null) {
             mUrlBar.setUrl("", null);
             return;
         }
 
         String url = getCurrentTab().getUrl().trim();
@@ skipping 134 matching lines @@
         if (getCurrentTab() == null) return ConnectionSecurityLevel.NONE;
         return getCurrentTab().getSecurityLevel();
     }
 
     @Override
     public void updateSecurityIcon(int securityLevel) {
         if (mState == STATE_TITLE_ONLY) return;
 
         mSecurityIconType = securityLevel;
 
+        boolean isOfflinePage = getCurrentTab() != null && getCurrentTab().isOfflinePage();
+        boolean showSecurityButton = securityLevel != ConnectionSecurityLevel.NONE || isOfflinePage;
+
         if (securityLevel == ConnectionSecurityLevel.NONE) {
-            mAnimDelegate.hideSecurityButton();
+            if (isOfflinePage && mShowsOfflinePage != isOfflinePage) {
+                TintedDrawable bolt = TintedDrawable.constructTintedDrawable(
+                        getResources(), R.drawable.offline_pin);
+                bolt.setTint(mUseDarkColors ? mDarkModeTint : mLightModeTint);
+                mSecurityButton.setImageDrawable(bolt);
+            }
         } else {
             boolean isSmallDevice = !DeviceFormFactor.isTablet(getContext());
             int id = LocationBarLayout.getSecurityIconResource(securityLevel, isSmallDevice);
             if (id == 0) {
-                mSecurityButton.setImageDrawable(null);
+                // Hide the button if we don't have an actual icon to display.
+                showSecurityButton = false;
             } else {
                 // ImageView#setImageResource is no-op if given resource is the current one.
                 mSecurityButton.setImageResource(id);
                 mSecurityButton.setTint(
                         LocationBarLayout.getColorStateList(securityLevel, getToolbarDataProvider(),
                                 getResources(), false /* omnibox is not opaque */));
             }
+        }
+
+        mShowsOfflinePage = isOfflinePage;
+
+        if (showSecurityButton) {
             mAnimDelegate.showSecurityButton();
+        } else {
+            mAnimDelegate.hideSecurityButton();
         }
+
         mUrlBar.emphasizeUrl();
         mUrlBar.invalidate();
     }
 
-    private void showOfflineBoltIfNecessary() {
-        boolean isOfflinePage = getCurrentTab() != null && getCurrentTab().isOfflinePage();
-        if (isOfflinePage == mShowsOfflinePage) return;
-
-        mShowsOfflinePage = isOfflinePage;
-        if (mShowsOfflinePage) {
-            // If we are showing an offline page, immediately update icon to offline bolt.
-            TintedDrawable bolt = TintedDrawable.constructTintedDrawable(
-                    getResources(), R.drawable.offline_pin);
-            bolt.setTint(mUseDarkColors ? mDarkModeTint : mLightModeTint);
-            mSecurityButton.setImageDrawable(bolt);
-            mAnimDelegate.showSecurityButton();
-        } else {
-            // We are hiding the offline page so connection security information will change.
-            mSecurityIconType = ConnectionSecurityLevel.NONE;
-            mAnimDelegate.hideSecurityButton();
-        }
-    }
-
     /**
      * For extending classes to override and carry out the changes related with the primary color
      * for the current tab changing.
      */
     @Override
     protected void onPrimaryColorChanged(boolean shouldAnimate) {
         if (mBrandColorTransitionActive) mBrandColorTransitionAnimation.cancel();
 
         final ColorDrawable background = getBackground();
         final int initialColor = background.getColor();
@@ skipping 215 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;
     }
 }