diff options
| author | Charles He <qiurui@google.com> | 2017-09-26 15:32:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-26 15:32:35 +0000 |
| commit | e66a5bcac1640b2361bf022ca30ace87f0777979 (patch) | |
| tree | b411bc423382630588e5c5af41c67560af3f7a31 /core/java/android | |
| parent | 56b69b9a9da17ddf44e6c73bc848a4cbae92bb78 (diff) | |
| parent | 6a79b0dff1d82e51d5f0a1d30f8491b6dcb4d6f5 (diff) | |
Merge "StatusBar: add DISABLE2_SYSTEM_ICONS flag"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/StatusBarManager.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index fe7afed8de13..80144bd7971b 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -70,14 +70,15 @@ public class StatusBarManager { * Setting this flag disables quick settings completely, but does not disable expanding the * notification shade. */ - public static final int DISABLE2_QUICK_SETTINGS = 0x00000001; + public static final int DISABLE2_QUICK_SETTINGS = 1; + public static final int DISABLE2_SYSTEM_ICONS = 1 << 1; public static final int DISABLE2_NONE = 0x00000000; - public static final int DISABLE2_MASK = DISABLE2_QUICK_SETTINGS; + public static final int DISABLE2_MASK = DISABLE2_QUICK_SETTINGS | DISABLE2_SYSTEM_ICONS; @IntDef(flag = true, - value = {DISABLE2_NONE, DISABLE2_MASK, DISABLE2_QUICK_SETTINGS}) + value = {DISABLE2_NONE, DISABLE2_MASK, DISABLE2_QUICK_SETTINGS, DISABLE2_SYSTEM_ICONS}) @Retention(RetentionPolicy.SOURCE) public @interface Disable2Flags {} |