diff options
| author | Caitlin Cassidy <ccassidy@google.com> | 2021-04-23 14:01:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-23 14:01:58 +0000 |
| commit | efaeb0c5640ccf786ce28cc1b8011add556455aa (patch) | |
| tree | a3b285ac9d017ad49e719bd4d8faec40213c937a /core/java | |
| parent | 8504b29989e9533b797f9ae75e70912fbe381e37 (diff) | |
| parent | eb457d50b755af9cf96e1a55a78b6e11aeb4575f (diff) | |
Merge "[Ongoing Call Chip] Don't show the chip on lockscreen." into sc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/StatusBarManager.java | 8 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 16 |
2 files changed, 21 insertions, 3 deletions
diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 1765849c8314..232b077538ef 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -74,6 +74,9 @@ public class StatusBarManager { public static final int DISABLE_SEARCH = View.STATUS_BAR_DISABLE_SEARCH; /** @hide */ + public static final int DISABLE_ONGOING_CALL_CHIP = View.STATUS_BAR_DISABLE_ONGOING_CALL_CHIP; + + /** @hide */ @Deprecated public static final int DISABLE_NAVIGATION = View.STATUS_BAR_DISABLE_HOME | View.STATUS_BAR_DISABLE_RECENT; @@ -85,7 +88,7 @@ public class StatusBarManager { public static final int DISABLE_MASK = DISABLE_EXPAND | DISABLE_NOTIFICATION_ICONS | DISABLE_NOTIFICATION_ALERTS | DISABLE_NOTIFICATION_TICKER | DISABLE_SYSTEM_INFO | DISABLE_RECENT | DISABLE_HOME | DISABLE_BACK | DISABLE_CLOCK - | DISABLE_SEARCH; + | DISABLE_SEARCH | DISABLE_ONGOING_CALL_CHIP; /** @hide */ @IntDef(flag = true, prefix = {"DISABLE_"}, value = { @@ -99,7 +102,8 @@ public class StatusBarManager { DISABLE_RECENT, DISABLE_BACK, DISABLE_CLOCK, - DISABLE_SEARCH + DISABLE_SEARCH, + DISABLE_ONGOING_CALL_CHIP }) @Retention(RetentionPolicy.SOURCE) public @interface DisableFlags {} diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index b2df3a942469..11fac0561907 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -4003,6 +4003,16 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * @hide + * + * NOTE: This flag may only be used in subtreeSystemUiVisibility. It is masked + * out of the public fields to keep the undefined bits out of the developer's way. + * + * Flag to disable the ongoing call chip. + */ + public static final int STATUS_BAR_DISABLE_ONGOING_CALL_CHIP = 0x04000000; + + /** + * @hide */ public static final int PUBLIC_STATUS_BAR_VISIBILITY_MASK = 0x00003FF7; @@ -4227,7 +4237,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, name = "STATUS_BAR_DISABLE_RECENT"), @ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_SEARCH, equals = STATUS_BAR_DISABLE_SEARCH, - name = "STATUS_BAR_DISABLE_SEARCH") + name = "STATUS_BAR_DISABLE_SEARCH"), + @ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_ONGOING_CALL_CHIP, + equals = STATUS_BAR_DISABLE_ONGOING_CALL_CHIP, + name = "STATUS_BAR_DISABLE_ONGOING_CALL_CHIP") }, formatToHexString = true) @SystemUiVisibility int mSystemUiVisibility; @@ -4256,6 +4269,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, STATUS_BAR_DISABLE_CLOCK, STATUS_BAR_DISABLE_RECENT, STATUS_BAR_DISABLE_SEARCH, + STATUS_BAR_DISABLE_ONGOING_CALL_CHIP, }) @Retention(RetentionPolicy.SOURCE) public @interface SystemUiVisibility {} |