summaryrefslogtreecommitdiff
path: root/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-10-09 11:14:30 -0700
committerXin Li <delphij@google.com>2020-10-10 20:38:57 -0700
commit986e6eeddf02959975e63a7cd138e70784540bf6 (patch)
treebf060846893c657436f9429650f2240f048dd0be /packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
parent1015bae311220fe8242c33e58e11a932ed6f8a3a (diff)
parent539d92beb7ed3638107c6d90c2f6a2e8a891256d (diff)
Merge ab/6749736 in stage.
Bug: 167233921 Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/BatteryMeterView.java')
-rw-r--r--packages/SystemUI/src/com/android/systemui/BatteryMeterView.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
index a46ab3a9e35b..5235a451d021 100644
--- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
@@ -234,7 +234,7 @@ public class BatteryMeterView extends LinearLayout implements
}
Dependency.get(TunerService.class)
- .addTunable(this, StatusBarIconController.ICON_BLACKLIST);
+ .addTunable(this, StatusBarIconController.ICON_HIDE_LIST);
mIsSubscribedForTunerUpdates = true;
}
@@ -287,8 +287,8 @@ public class BatteryMeterView extends LinearLayout implements
@Override
public void onTuningChanged(String key, String newValue) {
- if (StatusBarIconController.ICON_BLACKLIST.equals(key)) {
- ArraySet<String> icons = StatusBarIconController.getIconBlacklist(
+ if (StatusBarIconController.ICON_HIDE_LIST.equals(key)) {
+ ArraySet<String> icons = StatusBarIconController.getIconHideList(
getContext(), newValue);
setVisibility(icons.contains(mSlotBattery) ? View.GONE : View.VISIBLE);
}