summaryrefslogtreecommitdiff
path: root/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
diff options
context:
space:
mode:
authorCharles He <qiurui@google.com>2017-09-18 09:50:58 +0100
committerCharles He <qiurui@google.com>2017-09-25 21:29:27 +0100
commit6a79b0dff1d82e51d5f0a1d30f8491b6dcb4d6f5 (patch)
tree68320815a79331a8f15b9d7be2457d0a9f6ed102 /packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
parent8c238c5a7d7ff8b81a294a1476745f8bd6e235ca (diff)
StatusBar: add DISABLE2_SYSTEM_ICONS flag
Add a StatusBarManager flag to control the visibility of system icons such as connectivity info, battery, etc. Note that the clock is controlled separately through DISABLE_CLOCK. Also note that this flag differs from DISABLE_SYSTEM_INFO, which controls the system icons and the clock as a whole, but only works for the collapsed status bar (CollapsedStatusBarFragment). Bug: 65813398 Test: runtest systemui Test: manual, by using a modified version of TestDPC and DevicePolicyManagerService Change-Id: Icb61c7bb1a625edd818be7a66d7f15c3e812237b
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, 6 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
index 2b31967cea4f..2fe66a14a41d 100644
--- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
@@ -15,6 +15,8 @@
*/
package com.android.systemui;
+import static android.app.StatusBarManager.DISABLE2_SYSTEM_ICONS;
+import static android.app.StatusBarManager.DISABLE_NONE;
import static android.provider.Settings.System.SHOW_BATTERY_PERCENT;
import android.animation.ArgbEvaluator;
@@ -52,6 +54,7 @@ import com.android.systemui.statusbar.policy.DarkIconDispatcher.DarkReceiver;
import com.android.systemui.statusbar.policy.IconLogger;
import com.android.systemui.tuner.TunerService;
import com.android.systemui.tuner.TunerService.Tunable;
+import com.android.systemui.util.Utils.DisableStateTracker;
import java.text.NumberFormat;
@@ -101,6 +104,9 @@ public class BatteryMeterView extends LinearLayout implements
mSettingObserver = new SettingObserver(new Handler(context.getMainLooper()));
+ addOnAttachStateChangeListener(
+ new DisableStateTracker(DISABLE_NONE, DISABLE2_SYSTEM_ICONS));
+
mSlotBattery = context.getString(
com.android.internal.R.string.status_bar_battery);
mBatteryIconView = new ImageView(context);