Xin Li
27dcef4523
[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 30a1c99c1b -s ours am: 78e68f78c7 -s ours
...
am skip reason: Merged-In I35aae96e4ebb0c13bc567bb926f2e7a549f554ba with SHA-1 6c582e973d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15547733
Change-Id: I6162e93e7f80a6662e9a953883a2e02372c26009
2021-08-13 21:30:42 +00:00
TreeHugger Robot
6f21cc649e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 277d17849c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15506959
Change-Id: I1ba3e3797d358c396db60f9900dee35a06de926b
2021-08-13 21:29:59 +00:00
Sudheer Shanka
8502712492
[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 0ce17cddf9 -s ours
...
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301699
Change-Id: I19bf066c87ecc3f59496f10642d139748ed33506
2021-08-13 21:29:46 +00:00
Lucas Lin
0d88bdece9
[automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: c940a77495 -s ours
...
am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886baf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347258
Change-Id: Ic93e47714ceab7d01630c4ce5026fd169b3fd12e
2021-08-13 21:29:20 +00:00
Lucas Lin
ba72ebb1ea
[automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: d28527a3fe -s ours
...
am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886baf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347258
Change-Id: I98276ee1deb0f0e501c66e73e5988c10bf6178e3
2021-08-13 21:28:24 +00:00
Xi Han
b8655177fe
Merge "Do not display "Network Available" when WiFi disabled." into sc-qpr1-dev
2021-08-13 21:09:53 +00:00
TreeHugger Robot
47e2fa60c2
Merge "Auth ripple updates" into sc-dev am: 6ce7011395
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546250
Change-Id: Ic83d14f78d9909545214df60deaad11e4f85cd30
2021-08-13 20:54:45 +00:00
Xin Li
78e68f78c7
[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 30a1c99c1b -s ours
...
am skip reason: Merged-In I35aae96e4ebb0c13bc567bb926f2e7a549f554ba with SHA-1 6c582e973d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15547733
Change-Id: I4d5de89e4b12987a615c7c534c6b5740ec7eb1db
2021-08-13 20:53:29 +00:00
TreeHugger Robot
278c62c8b8
Merge "Auth ripple updates" into sc-dev am: 6ce7011395
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546250
Change-Id: I78b93601dd43e1cfba91b6cbda77c00a9dce6f7a
2021-08-13 20:53:20 +00:00
Julia Reynolds
f9d5c8a0fb
Merge "Simply ignore invalid keys" into sc-qpr1-dev am: 362b31f106
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15531685
Change-Id: Ifbd3b1294729ba94dc052fa41b2e8c4634f51eaf
2021-08-13 20:52:13 +00:00
Xin Li
ab3349d696
[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 30a1c99c1b -s ours
...
am skip reason: Merged-In I35aae96e4ebb0c13bc567bb926f2e7a549f554ba with SHA-1 6c582e973d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15547733
Change-Id: I4e344aae0efb943414ee16aa5d054d3c7232c723
2021-08-13 20:51:42 +00:00
Jeff DeCew
70a328921b
FooterView color logic cleanup
...
Bug reports showed that when night mode eneded due to schedule, the text color was updated but not the background color. Just from analyzing the code, this appears to be due to onConfigurationChanged not being called on the footer view, but NSSL.onUiModeChanged was calling into FooterView.setTextColor. So logically, this seems like a likely fix, even though I can't repro the bug.
Fixes: 190135611
Test: manual theme change continues to update footer colors.
Test: manual language change updates footer text.
Change-Id: If6fdb527eee244561dcd3975d859de93609662a5
2021-08-13 16:42:00 -04:00
TreeHugger Robot
6ce7011395
Merge "Auth ripple updates" into sc-dev
2021-08-13 20:41:18 +00:00
Xin Li
30a1c99c1b
Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev
2021-08-13 20:38:50 +00:00
Julia Reynolds
362b31f106
Merge "Simply ignore invalid keys" into sc-qpr1-dev
2021-08-13 20:26:18 +00:00
Ryan Mitchell
8c86f395be
Guard against null info when applying widget RROs
...
Add null checks to applyResourceOverlaysToWidgetsLocked to protect
against a widget provider component info being null.
Fixes: 196231621
Fixes: 196331791
Test: none
Change-Id: Ia762694523404ac508eb49600306048037f13658
2021-08-13 13:14:33 -07:00
Fabian Kozynski
1c78531922
Remove managed profile icon from QSBH
...
This adds it to the ignored icons in QuickStatusBarHeaderController
iconContainer.
Test: manual, create managed profile, icon doesn't show.
Fixes: 196243622
Change-Id: Ib97b9d947318b09d289076c63995327d356cb5fc
2021-08-13 15:50:51 -04:00
Joshua Mccloskey
ca0b929036
Merge "Destroy() client after onClientFinished." into sc-dev am: f5704ec276 am: b75f9b1565
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15536554
Change-Id: Ib84e6b50bada95b50c7ef55783639014411a701e
2021-08-13 19:21:19 +00:00
Neha Jain
2e78c3eae3
Merge "Limit keyguard views on alt displays" into sc-dev am: b3deaf2b6d am: dcb1cbfcfb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15547527
Change-Id: Ib4a8343b5a6eb25ddb9ecfdaccc022e1a7d38bc0
2021-08-13 19:20:49 +00:00
Alec Mouri
de6843e8e2
Merge "Remove bitwise plane information from ImageFormat's P010 docs" into sc-dev am: b0766d70d9 am: db2320b98f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15529193
Change-Id: I10190621b2031f84a43b2b33a8112bc2bdce8c98
2021-08-13 19:18:35 +00:00
TreeHugger Robot
a19ea32206
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f5557f625c -s ours am: c5ae3407f5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15550617
Change-Id: Icca6cd54849cf1d304b116a2564e479471e2586d
2021-08-13 19:13:05 +00:00
Beverly
7d8bf678f4
Auth ripple updates
...
* update the interpolator for the auth ripple so that it feels faster
* start the light reveal to be slightly ahead of the ripple
* increase radius size so the ripple isn't cutoff
Fixes: 196006323
Test: manual on sunfish and raven
Change-Id: Id2277b113e1241a21d5e98c9288fea27f0474115
2021-08-13 19:03:12 +00:00
Joshua Mccloskey
b75f9b1565
Merge "Destroy() client after onClientFinished." into sc-dev am: f5704ec276
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15536554
Change-Id: I0bdeb56c466928fa9a77ebb61ebd40b0a196f7dc
2021-08-13 18:57:37 +00:00
Joshua Mccloskey
c028b49ad6
Merge "Destroy() client after onClientFinished." into sc-dev am: f5704ec276 am: dc05d60161
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15536554
Change-Id: I8fc733829c05cdd6efba792a9dca14cba6bc348e
2021-08-13 18:57:35 +00:00
Neha Jain
fc522e0e18
Merge "Limit keyguard views on alt displays" into sc-dev am: b3deaf2b6d am: 8ed8e0b1ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15547527
Change-Id: I9672d3177b4fc14fe9721e8cc4a0874c24362faf
2021-08-13 18:57:26 +00:00
Alec Mouri
cdf02c5588
Merge "Remove bitwise plane information from ImageFormat's P010 docs" into sc-dev am: b0766d70d9 am: a10bdefe0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15529193
Change-Id: I275f7b82facd1f7be0be514aac79bd4e5c00bd0d
2021-08-13 18:57:02 +00:00
Neha Jain
dcb1cbfcfb
Merge "Limit keyguard views on alt displays" into sc-dev am: b3deaf2b6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15547527
Change-Id: I755f1329e1c8e0ed6fb006bbd3105f45d558eee8
2021-08-13 18:56:45 +00:00
TreeHugger Robot
abb92c61dd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f5557f625c -s ours am: 3fc51e6952 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15550617
Change-Id: I27c5c3d29b19fa0dd8bf958124c8bb0b1a9a0b6c
2021-08-13 18:56:41 +00:00
Alec Mouri
db2320b98f
Merge "Remove bitwise plane information from ImageFormat's P010 docs" into sc-dev am: b0766d70d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15529193
Change-Id: Ia6bd9b576f4956e1ef32353f2282cf30a26b2e70
2021-08-13 18:56:32 +00:00
Joshua Mccloskey
dc05d60161
Merge "Destroy() client after onClientFinished." into sc-dev am: f5704ec276
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15536554
Change-Id: Ib5be0dbb5215161f20a9e2d48a8d46e66038cfe6
2021-08-13 18:56:26 +00:00
Neha Jain
8ed8e0b1ea
Merge "Limit keyguard views on alt displays" into sc-dev am: b3deaf2b6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15547527
Change-Id: I6c0d069fcc3d98e8a26f5bf5aa9cd617240eb626
2021-08-13 18:56:10 +00:00
TreeHugger Robot
c5ae3407f5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f5557f625c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15550617
Change-Id: I3d925a0f9a0edd0935aa335061a4f2dddf673a6a
2021-08-13 18:55:48 +00:00
Alec Mouri
a10bdefe0f
Merge "Remove bitwise plane information from ImageFormat's P010 docs" into sc-dev am: b0766d70d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15529193
Change-Id: I30fb186a04b43d0375fd2ec814b23b9953e7d871
2021-08-13 18:55:45 +00:00
TreeHugger Robot
aa51767571
Merge changes from topic "presubmit-am-b2e291a416ff4d26ae9b9ac0b0a7cf6e" into sc-dev-plus-aosp am: 5dd1e5d1c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15550617
Change-Id: Ia7db684ef82923eca92c857149182033f056990c
2021-08-13 18:55:40 +00:00
Bill Yi
6706ccb434
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 75d8c094f4 am: e33efd8cbc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15550617
Change-Id: Iff7a30a40a4a70242ffd19cb0ed3a9a97eeb6d4d
2021-08-13 18:55:39 +00:00
TreeHugger Robot
3fc51e6952
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f5557f625c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15550617
Change-Id: I058f63ee8df43505dfbab5b84caf0a6927b78e41
2021-08-13 18:54:34 +00:00
Joshua Mccloskey
f5704ec276
Merge "Destroy() client after onClientFinished." into sc-dev
2021-08-13 18:49:32 +00:00
Neha Jain
b3deaf2b6d
Merge "Limit keyguard views on alt displays" into sc-dev
2021-08-13 18:45:32 +00:00
Alec Mouri
b0766d70d9
Merge "Remove bitwise plane information from ImageFormat's P010 docs" into sc-dev
2021-08-13 18:42:57 +00:00
TreeHugger Robot
f5557f625c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-13 18:37:20 +00:00
TreeHugger Robot
5dd1e5d1c9
Merge changes from topic "presubmit-am-b2e291a416ff4d26ae9b9ac0b0a7cf6e" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 75d8c094f4
Import translations. DO NOT MERGE ANYWHERE
2021-08-13 18:37:20 +00:00
Xin Li
926d9c8f8c
Merge stage-aosp-sc-ts-dev before making it an upstream
...
Bug: 169893837
Merged-In: I35aae96e4ebb0c13bc567bb926f2e7a549f554ba
Change-Id: I5eb0e93b01f1bdc95df250f5cf94b597ccc1d42f
2021-08-13 18:25:08 +00:00
Milton Wu
fe59586648
Add non-system overlay flag for usb perm dialog
...
Add private flag SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS for
UsbPermissionActivity.
With this flag, UsbPermissionActivity will not been overlapped with
views which are displayed on system alert window
Bug: 183610267
Test: atest UsbPermissionActivityTest#testHideNonSystemOverlay
Test: check the window private flag of UsbPermissionActivity contains
SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS or not.
Change-Id: I0863ff347ac3c2300f0dc649a630f55473ee180a
(cherry picked from commit 9a03ae1184 )
2021-08-13 18:04:07 +00:00
TreeHugger Robot
ffb74e933f
Merge "Camera: Initialize the forward processor along with the repeating pipeline" into sc-dev am: 7949cf90ac am: bff3df9ae8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523913
Change-Id: Iba037f13ddb2985ed0efed83c358c643c15f911f
2021-08-13 17:42:37 +00:00
Jayant Chowdhary
19488e114f
Merge "camera2: Documentation updates for ultra high resolution sensors." into sc-dev am: 115b62decc am: f2381fea39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15507831
Change-Id: Ic6f3b232d93c8550ff2fb7f5889b8162479e4f2b
2021-08-13 17:42:15 +00:00
TreeHugger Robot
4f4c00da70
Merge "Camera: Initialize the forward processor along with the repeating pipeline" into sc-dev am: 7949cf90ac am: 27df379840
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523913
Change-Id: I79357c9c9d434e97f080b99bcd172a4cf3ed3b48
2021-08-13 17:42:08 +00:00
Automerger Merge Worker
72a3896cc9
Merge "Merge "Camera: Return sequence id for advanced extension requests" into sc-dev am: 1ce567e28f am: 2f01685e4b" into sc-qpr1-dev-plus-aosp
2021-08-13 17:42:01 +00:00
TreeHugger Robot
4bd070e2b3
Merge "Camera: Return sequence id for advanced extension requests" into sc-dev am: 1ce567e28f am: 2f01685e4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15522464
Change-Id: Id057ca788ccf7252876d08766b33062870cc0c9d
2021-08-13 17:41:53 +00:00
Jayant Chowdhary
d3778ffcdb
Merge "camera2: Documentation updates for ultra high resolution sensors." into sc-dev am: 115b62decc am: 28dcfc3a28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15507831
Change-Id: I5df292f33a95a2d3a46111ccc52270d100622646
2021-08-13 17:41:49 +00:00
TreeHugger Robot
e355efd328
Merge "Camera: Return sequence id for advanced extension requests" into sc-dev am: 1ce567e28f am: 5dfec7560c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15522464
Change-Id: I6c5da7d1b1e7c616e2785b4c3557c7dace92c410
2021-08-13 17:41:37 +00:00