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 6cde0c968fa96ddd1977533f4b7892e891eaa56d..c34f475091d06a5104b3b9de2922d1e36d125ec7 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,8 +1290,12 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener, |
| mNavigationButton.setImageDrawable(null); |
| break; |
| case OFFLINE: |
| - mNavigationButton.setImageResource( |
| - mUseDarkColors ? R.drawable.offline_bolt : R.drawable.offline_bolt_light); |
| + Drawable bolt = ApiCompatibilityUtils.getDrawable( |
| + getResources(), R.drawable.offline_bolt); |
| + bolt.setColorFilter(ApiCompatibilityUtils.getColor(getResources(), mUseDarkColors |
|
fgorski
2016/03/01 21:45:38
Turns out you were right and this approach solves
|
| + ? R.color.locationbar_status_color |
| + : R.color.locationbar_status_color_light), PorterDuff.Mode.SRC_IN); |
| + mNavigationButton.setImageDrawable(bolt); |
| break; |
| default: |
| assert false; |
| @@ -1317,14 +1321,14 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener, |
| int verboseStatusVisibility = verboseStatusVisible ? VISIBLE : GONE; |
| mVerboseStatusTextView.setTextColor(ApiCompatibilityUtils.getColor(getResources(), |
| - mUseDarkColors ? R.color.locationbar_verbose_status_color |
| - : R.color.locationbar_light_verbose_status_color)); |
| + mUseDarkColors ? R.color.locationbar_status_color |
| + : R.color.locationbar_status_color_light)); |
| mVerboseStatusTextView.setVisibility(verboseStatusVisibility); |
| View separator = findViewById(R.id.location_bar_verbose_status_separator); |
| separator.setBackgroundColor(ApiCompatibilityUtils.getColor(getResources(), mUseDarkColors |
| ? R.color.locationbar_status_separator_color |
| - : R.color.locationbar_light_status_separator_color)); |
| + : R.color.locationbar_status_separator_color_light)); |
| separator.setVisibility(verboseStatusVisibility); |
| findViewById(R.id.location_bar_verbose_status_extra_space) |