[Offline pages] Reinstating the offline icon on tablet and fixing verbose state/URL emphasis

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 479 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 isSmallDevice = !DeviceFormFactor.isTablet(getContext());
         boolean isOfflinePage = getCurrentTab() != null && getCurrentTab().isOfflinePage();
-        boolean showSecurityButton = securityLevel != ConnectionSecurityLevel.NONE || isOfflinePage;
 
-        if (securityLevel == ConnectionSecurityLevel.NONE) {
-            if (isOfflinePage && mShowsOfflinePage != isOfflinePage) {
-                TintedDrawable bolt = TintedDrawable.constructTintedDrawable(
-                        getResources(), R.drawable.offline_pin);
-                bolt.setTint(mUseDarkColors ? mDarkModeTint : mLightModeTint);
-                mSecurityButton.setImageDrawable(bolt);
-            }
+        int id = LocationBarLayout.getSecurityIconResource(
+                securityLevel, isSmallDevice, isOfflinePage);
+        boolean showSecurityButton = true;
+        if (id == 0) {
+            // Hide the button if we don't have an actual icon to display.
+            showSecurityButton = false;
+            mSecurityButton.setImageDrawable(null);
         } else {
-            boolean isSmallDevice = !DeviceFormFactor.isTablet(getContext());
-            int id = LocationBarLayout.getSecurityIconResource(securityLevel, isSmallDevice);
-            if (id == 0) {
-                // 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 */));
-            }
+            // ImageView#setImageResource is no-op if given resource is the current one.
+            mSecurityButton.setImageResource(id);
+            mSecurityButton.setTint(
+                    LocationBarLayout.getColorStateList(securityLevel, getToolbarDataProvider(),
+                            getResources(), ColorUtils.shouldUseOpaqueTextboxBackground(

[Ted C, 2016/10/24 17:19:45]

why the change for the last param?  we never show the omnibox background in
custom tabs, so it is always opaque.  I think it should remain false in this
file.

[fgorski, 2016/10/24 22:34:14]

For some reason when testing it on Friday I saw improperly dimmed icon.
Having retried it today setting it to false was correct.

Original code for handling the offline pin icon was incorrect, and that is
probably the version I tested with and started "fixing" the problem based on.

+                                                    getToolbarDataProvider().getPrimaryColor())));
         }
 
         mShowsOfflinePage = isOfflinePage;
 
         if (showSecurityButton) {
             mAnimDelegate.showSecurityButton();
         } else {
             mAnimDelegate.hideSecurityButton();
         }
 
@@ skipping 229 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;
     }
 }