diff options
| author | Benjamin Franz <bfranz@google.com> | 2015-04-29 08:35:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-29 08:36:00 +0000 |
| commit | c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b (patch) | |
| tree | fa2f4dfed3824816465c6dc567aea07e0fb487f7 /core/java/android/app | |
| parent | 25466e0a8f3e0f7f1e758642519f3aa8643f6f26 (diff) | |
| parent | 27cf146361125d1233c487ec215d5d794f5dde17 (diff) | |
| download | frameworks_base-c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b.zip frameworks_base-c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b.tar.gz frameworks_base-c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b.tar.bz2 | |
Merge "Add status bar flag to disable quick settings" into mnc-dev
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/StatusBarManager.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 207519c..31d1ab7 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -63,12 +63,20 @@ public class StatusBarManager { | DISABLE_SYSTEM_INFO | DISABLE_RECENT | DISABLE_HOME | DISABLE_BACK | DISABLE_CLOCK | DISABLE_SEARCH; + /** + * Flag to disable quick settings. + * + * 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_NONE = 0x00000000; - public static final int DISABLE2_MASK = 0x00000000; + public static final int DISABLE2_MASK = DISABLE2_QUICK_SETTINGS; @IntDef(flag = true, - value = {DISABLE2_NONE, DISABLE2_MASK}) + value = {DISABLE2_NONE, DISABLE2_MASK, DISABLE2_QUICK_SETTINGS}) @Retention(RetentionPolicy.SOURCE) public @interface Disable2Flags {} |