diff options
| author | Caitlin Cassidy <ccassidy@google.com> | 2021-04-15 20:59:44 +0000 |
|---|---|---|
| committer | Caitlin Cassidy <ccassidy@google.com> | 2021-04-22 15:18:12 +0000 |
| commit | eb457d50b755af9cf96e1a55a78b6e11aeb4575f (patch) | |
| tree | 73267e2c59b01033d1cfe2ff710aa173118fbd3a /core/java/android/view/View.java | |
| parent | 8476c060044bbe99a21a33824797341bdbf858a9 (diff) | |
[Ongoing Call Chip] Don't show the chip on lockscreen.
Also moves the #initNotificationIconArea call to be within
CollapsedStatusBarFragment, rather than requiring StatusBar to call it.
This makes our unit tests better because now we don't need to call it
manually.
Also fix a bug in #onDozingChanged that was passing disabled1 in for
disabled2.
Test: atest and manual
Bug: 183229367
Fixes: 185897059
Change-Id: I0a65f9e90e66680f0b602b89f89ec0a4900e9df8
Diffstat (limited to 'core/java/android/view/View.java')
| -rw-r--r-- | core/java/android/view/View.java | 16 |
1 files changed, 15 insertions, 1 deletions
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 {} |