Beverly Tai
51e68e2a08
Merge "Use layout parameters to determine lock icon location" into sc-dev am: d20a486dce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15482397
Change-Id: I3df3fbd154992579edcc000b89b7afc1e8be45cc
2021-08-16 21:49:22 +00:00
Beverly Tai
d188dc349b
Merge "Use layout parameters to determine lock icon location" into sc-dev am: d20a486dce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15482397
Change-Id: I48da9b6b3de982acea6983e3c98fc7732caee710
2021-08-16 21:48:38 +00:00
Beverly Tai
d20a486dce
Merge "Use layout parameters to determine lock icon location" into sc-dev
2021-08-16 21:26:14 +00:00
Jeff DeCew
aba6cc0a73
Merge "FooterView color logic cleanup" into sc-qpr1-dev am: 3e7384fbe2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549419
Change-Id: Ica7f35ecea2c2a4119a6efb6b19048d07c817846
2021-08-16 20:29:37 +00:00
Neha Jain
b58db8a757
Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 am: 7c51d30f77
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: Id68721b829b75ab93bcdec54f7da546c76b1e049
2021-08-16 20:29:16 +00:00
Evan Laird
f7c5e4be9b
DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29 am: 2270569990
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I4fae4a6a867a1811a59ccf8ffb5b95ae16c0bcb3
2021-08-16 20:29:06 +00:00
Neha Jain
7860f54665
Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 am: eaea8772e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I73d96cf27d4d98f19e2e8c2b9a40605cddbf29ab
2021-08-16 20:28:48 +00:00
Evan Laird
cee4b89a43
DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29 am: 4d38a8d038
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I003ab66ed4727a9fc19d9fbee5290b1d98df4d0a
2021-08-16 20:28:45 +00:00
Lucas Dupin
dd7ed60de0
Revert "Revert "Migrate boot animation from GLES 1.0 to GLES2.0.""
...
This reverts commit 2ded80094e .
Reason for revert: Working on fixing the regression that happened on Wembly, so we can resume feature work.
Change-Id: I9a624beffdaf97f131046fd4441a251ed3a448ad
Test: adb shell /system/bin/bootanimation
Bug: 190093578
(cherry picked from commit 8eedc0293d )
2021-08-16 20:17:48 +00:00
Jeff DeCew
3e7384fbe2
Merge "FooterView color logic cleanup" into sc-qpr1-dev
2021-08-16 20:12:59 +00:00
Neha Jain
7c51d30f77
Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I875e675d2740e1bdeb7356e6aa1ba88dd463ef2c
2021-08-16 20:12:02 +00:00
Evan Laird
2270569990
DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I43d21926050499232df9b41b94bdf60ff77369c6
2021-08-16 20:11:55 +00:00
Neha Jain
eaea8772e9
Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: Ic923a4798478b33e122cb9625043d230b0c06aa7
2021-08-16 20:11:25 +00:00
Evan Laird
4d38a8d038
DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I0fdc922d4d6ab7c0d0f291e4c93307047c0713d5
2021-08-16 20:11:18 +00:00
Neha Jain
def23772a7
Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev
2021-08-16 19:56:14 +00:00
Huihong Luo
816a24f5a2
Merge "Remove Webview Overlays on destroy" into sc-dev am: e44bc77bc3 am: 2f880cfa3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546814
Change-Id: I48ffcf3e8464fea57541384ecbedb3a4f3a3cc38
2021-08-16 19:51:39 +00:00
Huihong Luo
22f14c9f5e
Merge "Remove Webview Overlays on destroy" into sc-dev am: e44bc77bc3 am: dc7594b513
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546814
Change-Id: Ib3a6802e716f41ab05067ab310a33657a9728924
2021-08-16 19:43:12 +00:00
Huihong Luo
35b1dde19b
Turn on Webview Overlays
...
Change the default value of the sysprop to be true.
Bug: 173671170
Test: install webview apks from Vasiliy, make sure surface control is
used.
Change-Id: Idf495a2be3b2bdba4fdaa380a5dbe9fd96158a97
2021-08-16 19:39:21 +00:00
Huihong Luo
dc7594b513
Merge "Remove Webview Overlays on destroy" into sc-dev am: e44bc77bc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546814
Change-Id: Ief9558864ee9e46b1c3488403a37cecd78edb258
2021-08-16 19:38:10 +00:00
Jeff DeCew
2de4373e93
Merge changes I09b3999a,I590be0ba into sc-qpr1-dev am: 10c7e2b811
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549414
Change-Id: I09ff92b8debe78859e621fd6ac013d8281959d07
2021-08-16 19:38:06 +00:00
Huihong Luo
2f880cfa3d
Merge "Remove Webview Overlays on destroy" into sc-dev am: e44bc77bc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546814
Change-Id: I7a93ce3224ad1f4fc8dfd8a180dd3dec683fc936
2021-08-16 19:37:40 +00:00
Winson Chiu
864538dd29
Revert "Use StorageManager#isUserKeyUnlocked to determine CE storage in PMS"
...
This reverts commit 76e6f9d221 .
Reason for revert: b/196030595
Bug: 196030595
Change-Id: Idf42eee3277ceace275aad3e11c7ee692f1171a6
2021-08-16 12:35:02 -07:00
Huihong Luo
e44bc77bc3
Merge "Remove Webview Overlays on destroy" into sc-dev
2021-08-16 19:22:01 +00:00
Jeff DeCew
10c7e2b811
Merge changes I09b3999a,I590be0ba into sc-qpr1-dev
...
* changes:
Use tertiary accent color for expander with unread count.
Fix ContrastColorUtil.findContrastColorAgainstDark to return the valid color
2021-08-16 19:21:18 +00:00
Hongguang Chen
d355459a3c
Merge "Fix Quiescent Reboot Reason" am: 850866e94a am: 933dacacf8 am: dc2d21b93d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751962
Change-Id: I418d770eb17a316e6267d1b22a5b951f58b8f0e5
2021-08-16 19:11:18 +00:00
Hongguang Chen
dc2d21b93d
Merge "Fix Quiescent Reboot Reason" am: 850866e94a am: 933dacacf8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751962
Change-Id: Ieb6970f1ca8303baa8f27744ec24c62dda98867b
2021-08-16 18:41:34 +00:00
Hongguang Chen
933dacacf8
Merge "Fix Quiescent Reboot Reason" am: 850866e94a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751962
Change-Id: If0cd58c17c3049597147389257f4dcfe895b1f54
2021-08-16 18:29:03 +00:00
Hongguang Chen
850866e94a
Merge "Fix Quiescent Reboot Reason"
2021-08-16 18:12:18 +00:00
Jeff Sharkey
5caec096e4
Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev am: 5af6057607 am: 3d3db4b676
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15518456
Change-Id: I364909895eb27d0a24ba0eb6a8f40ec4e65b8a5d
2021-08-16 16:19:32 +00:00
Jeff Sharkey
dd4b948409
Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev am: 5af6057607 am: e99475ac37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15518456
Change-Id: Ib3032e8f1dd3ecdd00b518b95fdb25184840fb13
2021-08-16 16:19:08 +00:00
Jeff Sharkey
3d3db4b676
Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev am: 5af6057607
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15518456
Change-Id: I412bc049b951516c9abd2c8d821ca71db810e2e9
2021-08-16 16:06:29 +00:00
Jeff Sharkey
e99475ac37
Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev am: 5af6057607
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15518456
Change-Id: Iff34ad44acacd02e949c806c75f449b461c74e77
2021-08-16 16:05:45 +00:00
Jeff Sharkey
5af6057607
Merge "Preserve certain "Nearby devices" implicit grants." into sc-dev
2021-08-16 15:55:08 +00:00
Ryan Mitchell
f34a97716a
Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac27 am: 9fd3a5cc5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543977
Change-Id: I9e54ecffb45f0248d6aa83ed51d435419985588e
2021-08-16 15:42:00 +00:00
Ryan Mitchell
ed2824c92d
Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac27 am: 73feaa09a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543977
Change-Id: I594d0ece99a0dce1ce59602f35aa824c5c02b2f1
2021-08-16 15:41:46 +00:00
Ryan Mitchell
9fd3a5cc5e
Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543977
Change-Id: I3709c3153186b42cdc9923605b2d895183625a97
2021-08-16 15:23:03 +00:00
Ryan Mitchell
73feaa09a6
Merge "Guard against null info when applying widget RROs" into sc-dev am: 1561c6ac27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543977
Change-Id: I982da8dc1e245e339d3f03c7c084f88f8ad1b61d
2021-08-16 15:22:03 +00:00
Ryan Mitchell
1561c6ac27
Merge "Guard against null info when applying widget RROs" into sc-dev
2021-08-16 15:08:06 +00:00
Jeff DeCew
2bd5f502fd
Make foreground color selection in SmartReplyView and RemoteInputView match Notification.
...
Fixes: 196585371
Test: post colorized notification with luminance between .2 and .5; validate that smart replies and remote input use black text to match the notification.
Change-Id: I5ea69181755ed5c2b48352a0379ae4e898202e21
Merged-In: I5ea69181755ed5c2b48352a0379ae4e898202e21
2021-08-16 14:37:42 +00:00
Jeff DeCew
d8054270e7
Use tertiary accent color for expander with unread count.
...
Fixes: 196586577
Test: visual inspection
Test: atest android.app.NotificationTest
Change-Id: I09b3999ad1c51615fbf7c8027dc65e6750721f18
2021-08-16 14:19:13 +00:00
Jeff DeCew
4c0e8a62e6
Fix ContrastColorUtil.findContrastColorAgainstDark to return the valid color
...
Fixes: 196600502
Test: atest ContrastColorUtilTest
Change-Id: I590be0ba30c03e867bf08558483239818b3aff82
2021-08-16 14:14:53 +00:00
Evan Laird
2b79873e29
DO NOT MERGE: Register NetworkController to DumpManager
...
It seems that enough Dependency.get() calls were removed for
NetworkController that the dumpsys stopped including NetworkController
in it. This CL manually registers NetworkController so we can have those
logs back.
Test: `adb shell dumpsys activity service com.android.systemui/.SystemUIService | grep NetworkController`
Fixes: 196486687
Change-Id: Id8865dd2159a6e3d85ebe80a3d0c4e05d0c16491
2021-08-16 13:53:06 +00:00
Beverly
d704706f28
Use layout parameters to determine lock icon location
...
So we don't rely on the coordinates coming from centering the view
(using gravity).
Test: manual
Fixes: 196280198
Change-Id: Iee7a7e5732d27a782d51e39e4d52b3601814bec3
2021-08-16 13:41:34 +00:00
Austin Wang
a88d234f4f
Auto adjust screen brightness when display state on while docked
...
Enable the auto screen brightness for display on when docked.
DOZE_AOD_DOCKED has STATE_ON display state in cases when
we don't need to worry about registering for the brightness sensor when
the display is on (ie: getSelectivelyRegisterProxSensor=false OR
brightness sensor doesn't use prox)
With this change, devices with getSelectivelyRegisterProxSensor=true
and brightnessSensorUsesProx=true will still not register for the
brightness sensor when the display state is on.
Bug: 194151347
Test: atest DozeScreenBrightnessTest
Test: manually verify under DOZE_AOD_DOCKED on devices with and w/o
under display prox sensors / brightness sensors that use prox
Change-Id: I04f88e7639a9cb0510a985d220da91fd1fb54313
2021-08-16 13:05:04 +00:00
Selim Cinek
b60af8ab40
Merge "Don't create one-handed-background-panel after rotation" into sc-dev am: ab89e910bc am: 193406410a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15537318
Change-Id: I0af541729aded40dc860d977dd39d6ffdec42a56
2021-08-16 12:01:38 +00:00
Selim Cinek
46c86140d0
Merge "Don't create one-handed-background-panel after rotation" into sc-dev am: ab89e910bc am: 557189cf28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15537318
Change-Id: Ic37b7620ab3e3883d0ba150c8e2c40780fc592a7
2021-08-16 12:01:17 +00:00
Selim Cinek
193406410a
Merge "Don't create one-handed-background-panel after rotation" into sc-dev am: ab89e910bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15537318
Change-Id: I772cb9e60857aebda21a11083ed2bc2690a1517c
2021-08-16 11:52:16 +00:00
Selim Cinek
557189cf28
Merge "Don't create one-handed-background-panel after rotation" into sc-dev am: ab89e910bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15537318
Change-Id: I5f992e78160d4ba8e71264033efdb474d22e2f87
2021-08-16 11:51:22 +00:00
Selim Cinek
ab89e910bc
Merge "Don't create one-handed-background-panel after rotation" into sc-dev
2021-08-16 11:40:26 +00:00
James Wei
c84e69def9
USB: Correct title bar notification am: c0162a74b9 am: 4f7f6fba23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15580595
Change-Id: I0ac86bf772977f32c643365802d13d8134175ba5
2021-08-16 11:01:42 +00:00