diff options
| author | Jason Chang <jasonsfchang@google.com> | 2018-04-11 11:17:58 +0800 |
|---|---|---|
| committer | Jason Chang <jasonsfchang@google.com> | 2018-04-11 11:17:58 +0800 |
| commit | b4e879d6e56857ef3d64e92fbc6f8044fc3dbc89 (patch) | |
| tree | 2fd28de3b2ed675bb5f30e96f3fb614a867f68f4 /packages/SystemUI/src/com/android/systemui/BatteryMeterView.java | |
| parent | 0a83fef4ac2e62822dc886b0ae7713def492d586 (diff) | |
[SettingsLib] Update Utils APIs usage
Update Utils.getColorAttr and similar methods in Utils to return a ColorStateList instead of a color
Bug: 74872054
Test: Force to display different color items then manually test
Change-Id: I92697a597b532ba95f29a886baa114ed6d0ac632
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/BatteryMeterView.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/BatteryMeterView.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java index 0683514f6f2a..84bb7fed19ea 100644 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java @@ -164,8 +164,8 @@ public class BatteryMeterView extends LinearLayout implements if (mUseWallpaperTextColors) { updateColors( - Utils.getColorAttr(mContext, R.attr.wallpaperTextColor), - Utils.getColorAttr(mContext, R.attr.wallpaperTextColorSecondary)); + Utils.getColorAttrDefaultColor(mContext, R.attr.wallpaperTextColor), + Utils.getColorAttrDefaultColor(mContext, R.attr.wallpaperTextColorSecondary)); } else { updateColors(mNonAdaptedForegroundColor, mNonAdaptedBackgroundColor); } @@ -180,10 +180,13 @@ public class BatteryMeterView extends LinearLayout implements Utils.getThemeAttr(context, R.attr.darkIconTheme)); Context dualToneLightTheme = new ContextThemeWrapper(context, Utils.getThemeAttr(context, R.attr.lightIconTheme)); - mDarkModeBackgroundColor = Utils.getColorAttr(dualToneDarkTheme, R.attr.backgroundColor); - mDarkModeFillColor = Utils.getColorAttr(dualToneDarkTheme, R.attr.fillColor); - mLightModeBackgroundColor = Utils.getColorAttr(dualToneLightTheme, R.attr.backgroundColor); - mLightModeFillColor = Utils.getColorAttr(dualToneLightTheme, R.attr.fillColor); + mDarkModeBackgroundColor = Utils.getColorAttrDefaultColor(dualToneDarkTheme, + R.attr.backgroundColor); + mDarkModeFillColor = Utils.getColorAttrDefaultColor(dualToneDarkTheme, + R.attr.fillColor); + mLightModeBackgroundColor = Utils.getColorAttrDefaultColor(dualToneLightTheme, + R.attr.backgroundColor); + mLightModeFillColor = Utils.getColorAttrDefaultColor(dualToneLightTheme, R.attr.fillColor); } @Override |