[Offline pages] Adding the offline bolt light icon

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.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.omnibox;
 
 import static org.chromium.chrome.browser.toolbar.ToolbarPhone.URL_FOCUS_CHANGE_ANIMATION_DURATION_MS;
 
 import android.Manifest;
 import android.animation.Animator;
@@ skipping 1272 matching lines @@
                         : Color.WHITE, PorterDuff.Mode.SRC_IN);
                 mNavigationButton.setImageDrawable(page);
                 break;
             case MAGNIFIER:
                 mNavigationButton.setImageResource(R.drawable.ic_omnibox_magnifier);
                 break;
             case EMPTY:
                 mNavigationButton.setImageDrawable(null);
                 break;
             case OFFLINE:
-                mNavigationButton.setImageResource(R.drawable.offline_bolt);
+                mNavigationButton.setImageResource(
+                        mUseDarkColors ? R.drawable.offline_bolt : R.drawable.offline_bolt_light);
                 break;
             default:
                 assert false;
         }
 
-        mNavigationButton.setAlpha(buttonType == NavigationButtonType.OFFLINE ? 0.54f : 1.0f);
-
         if (mNavigationButton.getVisibility() != VISIBLE) {
             mNavigationButton.setVisibility(VISIBLE);
         }
         mNavigationButtonType = buttonType;
 
         updateVerboseStatusVisibility();
         updateLocationBarIconContainerVisibility();
     }
 
     /**
      * Update visibility of the verbose status based on the button type and focus state of the
      * omnibox.
      */
     private void updateVerboseStatusVisibility() {
         boolean verboseStatusVisible =
                 mNavigationButtonType == NavigationButtonType.OFFLINE && !mUrlHasFocus;
+
         int verboseStatusVisibility = verboseStatusVisible ? VISIBLE : GONE;
+
+        mVerboseStatusTextView.setTextColor(ApiCompatibilityUtils.getColor(
+                getResources(), mUseDarkColors ? R.color.locationbar_verbose_status_color
+                                               : R.color.locationbar_light_verbose_status_color));

[Ted C, 2016/02/26 17:58:58]

despite what git cl format tries to do, this should be 8 from the start of
getResources()

one thing I would try to do is put getResources() on the first line and see if
the whole ternary can fit on a the second line together.

[fgorski, 2016/02/26 18:13:17]

Done.

         mVerboseStatusTextView.setVisibility(verboseStatusVisibility);
-        findViewById(R.id.location_bar_verbose_status_separator)
-                .setVisibility(verboseStatusVisibility);
+
+        View separator = findViewById(R.id.location_bar_verbose_status_separator);
+        separator.setBackgroundColor(ApiCompatibilityUtils.getColor(getResources(), mUseDarkColors
+                        ? R.color.locationbar_status_separator_color

[Ted C, 2016/02/26 17:58:58]

-8 indent

[fgorski, 2016/02/26 18:13:17]

Done.

+                        : R.color.locationbar_light_status_separator_color));
+        separator.setVisibility(verboseStatusVisibility);
+
         findViewById(R.id.location_bar_verbose_status_extra_space)
                 .setVisibility(verboseStatusVisibility);
     }
 
     /**
      * Update the visibility of the location bar icon container based on the state of the
      * security and navigation icons.
      */
     protected void updateLocationBarIconContainerVisibility() {
         boolean showContainer =
@@ skipping 1098 matching lines @@
     public View getContainerView() {
         return this;
     }
 
     @Override
     public void setTitleToPageTitle() { }
 
     @Override
     public void setShowTitle(boolean showTitle) { }
 }