Chromium Code Reviews| Index: chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java |
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java |
| index 9cf07f47317d78013aaa9b2421cd4ad806ca412a..4970e7b1384059d43f8bd2e47d1d2f899c3d21ad 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java |
| @@ -1290,14 +1290,13 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener, |
| 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); |
| } |
| @@ -1314,10 +1313,20 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener, |
| 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 shoul
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); |
| } |