TreeHugger Robot
ad395487d1
Merge changes I0ababa6b,I1a1ad69b into tm-dev am: 27a45d8ec3 am: 98a9953334
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577092
Change-Id: I1e2c3e27fe426c28e7d211922b5c37eb531b19bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 22:34:58 +00:00
Jorge Gil
67fb0d155a
Merge "Allow overridding the exitPip destination bounds" into tm-qpr-dev
2022-05-24 22:16:39 +00:00
TreeHugger Robot
98a9953334
Merge changes I0ababa6b,I1a1ad69b into tm-dev am: 27a45d8ec3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577092
Change-Id: I6daa729fb8d09005fa84ecbc54d450da257238f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 22:15:03 +00:00
TreeHugger Robot
27a45d8ec3
Merge changes I0ababa6b,I1a1ad69b into tm-dev
...
* changes:
Run cancelAction if bouncer is canceled
Fix bouncer flicker on lockscreen shade transition
2022-05-24 21:49:10 +00:00
Matt Casey
f96704530c
Merge "Change remote copy intent behavior." into tm-dev am: 4d6f731761 am: 4b31535805
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18557688
Change-Id: I7745877a511887920d3599836e94997a026ede47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 20:18:02 +00:00
Matt Casey
4b31535805
Merge "Change remote copy intent behavior." into tm-dev am: 4d6f731761
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18557688
Change-Id: Ife0c4eb5743ec1bd2c760ff7e1647d7a161d79f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 19:47:04 +00:00
Lyn Han
849235c84c
Merge "Fix white line before shelf on lockscreen" into tm-dev am: 565c12dd94 am: ed0976bfa6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18132915
Change-Id: Iaa549961520a906a53c6dd799a7715166cd70867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 19:40:41 +00:00
Jing Ji
60cf6be172
Merge "Hide the stop button for the device admin app in the task manager" into tm-dev am: d62d63b26a am: 86af120e9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18567918
Change-Id: I8376a3e032fa7d20cb747c556533b9adf14c52c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 19:40:22 +00:00
Matt Casey
4d6f731761
Merge "Change remote copy intent behavior." into tm-dev
2022-05-24 19:40:03 +00:00
Jing Ji
d7bdd3b62a
Merge "Construct the UidState in case of not found during unparceling" into tm-dev am: 0fe49ee574 am: ed578c06b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18563201
Change-Id: Ib74c5895d80d0cbac01e26848f0a2d185ea68308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 19:39:58 +00:00
Justin Weir
b2d0ad8c5a
Merge "Add a unique ID to MediaDeviceData" into tm-dev am: a275233fc5 am: 2850b8481a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18565545
Change-Id: Idc03097425da98ca263031a853b5b6b1f44b136a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 19:39:36 +00:00
Lyn Han
ed0976bfa6
Merge "Fix white line before shelf on lockscreen" into tm-dev am: 565c12dd94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18132915
Change-Id: I041cd00443e444f56e01f313e06afc80f7df4943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 19:38:17 +00:00
Lyn Han
565c12dd94
Merge "Fix white line before shelf on lockscreen" into tm-dev
2022-05-24 19:34:01 +00:00
Jing Ji
86af120e9e
Merge "Hide the stop button for the device admin app in the task manager" into tm-dev am: d62d63b26a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18567918
Change-Id: Ic14b1bf3b62b4146683c2ca323228c92fd053382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 19:02:15 +00:00
Jing Ji
ed578c06b2
Merge "Construct the UidState in case of not found during unparceling" into tm-dev am: 0fe49ee574
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18563201
Change-Id: Ie6fe96ae9551290c6e8c4119f254d7a03cd9050d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 19:01:24 +00:00
Justin Weir
2850b8481a
Merge "Add a unique ID to MediaDeviceData" into tm-dev am: a275233fc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18565545
Change-Id: I72e77d11d1199f887bb3f96e33bfd856712d2b45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 19:00:59 +00:00
Jing Ji
d62d63b26a
Merge "Hide the stop button for the device admin app in the task manager" into tm-dev
2022-05-24 18:55:36 +00:00
Jing Ji
0fe49ee574
Merge "Construct the UidState in case of not found during unparceling" into tm-dev
2022-05-24 18:43:10 +00:00
Justin Weir
a275233fc5
Merge "Add a unique ID to MediaDeviceData" into tm-dev
2022-05-24 18:38:58 +00:00
Dave McCloskey
6e2134a9df
Merge "Enforce USE_ATTESTATION_VERIFICATION_SERVICE permission to call APIs." into tm-dev am: 431816112a am: 6f8858f5ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18494488
Change-Id: I565ecc13c88428ef99d0fcf6963c5e298c706d38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 18:08:29 +00:00
Chavi Weingarten
ce679a846b
Merge "Add isClone to InputWindowHandle" into tm-dev am: 96f4a2afc2 am: ed3ec69be3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030066
Change-Id: Iba68cfbf1350444c0a412e6588a38a474e0fc08e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 18:08:20 +00:00
Dave McCloskey
6f8858f5ec
Merge "Enforce USE_ATTESTATION_VERIFICATION_SERVICE permission to call APIs." into tm-dev am: 431816112a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18494488
Change-Id: Ic92eef42d5ffb66860ab878a1c2ebe2f862754da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 17:31:18 +00:00
Chavi Weingarten
ed3ec69be3
Merge "Add isClone to InputWindowHandle" into tm-dev am: 96f4a2afc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030066
Change-Id: I9c21f969c35b33897e43cd9f760a98b44733a0f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 17:30:52 +00:00
Dave McCloskey
431816112a
Merge "Enforce USE_ATTESTATION_VERIFICATION_SERVICE permission to call APIs." into tm-dev
2022-05-24 17:15:28 +00:00
Chavi Weingarten
96f4a2afc2
Merge "Add isClone to InputWindowHandle" into tm-dev
2022-05-24 16:57:32 +00:00
Jing Ji
52905be4d9
Merge "Don't remove the common processes from the procstats.resetSafely" into tm-dev am: 811e3c9d08 am: 39e98f97be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18561414
Change-Id: I53e14b4ccbbcade08767ab5ff426e71599acd9b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 16:12:58 +00:00
TreeHugger Robot
803622fd23
Merge "Inflate media notification icons in MediaCoordinator" into tm-dev am: e76c9147b6 am: 19fdc6a19e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18432858
Change-Id: Iaa34105cf572bf53eb56cac95573afe0a7266ddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 16:12:51 +00:00
TreeHugger Robot
e6fbc3cfc6
Merge "Avert potential crashes in NotificationChildrenContainer.getMinHeight" into tm-dev am: fb5ea447aa am: 561c9d733c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18557779
Change-Id: I4347bef8ca067057718fb89bbbe53c5865f5e016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 16:12:33 +00:00
Nicolas Geoffray
cdf229894e
Merge "Update boot image and system server profiles [M5C5P80S0]" into tm-dev am: 720e68aa08 am: 94d4f7932e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577064
Change-Id: I916c7db4ff92c2397c57a2bb1b95328506e37ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 16:11:33 +00:00
Jing Ji
39e98f97be
Merge "Don't remove the common processes from the procstats.resetSafely" into tm-dev am: 811e3c9d08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18561414
Change-Id: I4d005b14c73ddb41f615c7c2cbfee1ba22daaec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 16:11:29 +00:00
Mady Mellor
ca16c386a0
Merge changes I282ed7eb,I4e9ca9ed into tm-dev am: 772f09fe07 am: 2c8a9755ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18563479
Change-Id: I5d29552e2976c15d05e5b1a384990e7cb0644485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 16:11:15 +00:00
TreeHugger Robot
19fdc6a19e
Merge "Inflate media notification icons in MediaCoordinator" into tm-dev am: e76c9147b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18432858
Change-Id: I9e36e6b89e17a1fd0cb4db98041e40689ce381f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 16:11:02 +00:00
Jing Ji
811e3c9d08
Merge "Don't remove the common processes from the procstats.resetSafely" into tm-dev
2022-05-24 15:51:06 +00:00
TreeHugger Robot
e76c9147b6
Merge "Inflate media notification icons in MediaCoordinator" into tm-dev
2022-05-24 15:46:36 +00:00
TreeHugger Robot
561c9d733c
Merge "Avert potential crashes in NotificationChildrenContainer.getMinHeight" into tm-dev am: fb5ea447aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18557779
Change-Id: Ia86244fa155a273a0b3788f713e7e968149e708d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 15:40:01 +00:00
TreeHugger Robot
fb5ea447aa
Merge "Avert potential crashes in NotificationChildrenContainer.getMinHeight" into tm-dev
2022-05-24 15:39:10 +00:00
Nicolas Geoffray
94d4f7932e
Merge "Update boot image and system server profiles [M5C5P80S0]" into tm-dev am: 720e68aa08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577064
Change-Id: Iaeedf1c9e151621ea336a7323cbca3353bb5a7c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 15:39:00 +00:00
Mady Mellor
2c8a9755ef
Merge changes I282ed7eb,I4e9ca9ed into tm-dev am: 772f09fe07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18563479
Change-Id: I8e79133e9fb82e08b999c074189266ac419325bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 15:38:37 +00:00
Nicolas Geoffray
720e68aa08
Merge "Update boot image and system server profiles [M5C5P80S0]" into tm-dev
2022-05-24 15:37:58 +00:00
Matt Pietal
1de979862b
Run cancelAction if bouncer is canceled
...
The cancelAction was never run on non-UDFPS devices when the bouncer
was canceled. The check for bouncerIsOrWillBeShowing() will always be
true, so move the call to cancel AFTER the bouncer hide() invocation.
Fixes: 233741191
Test: atest StatusBarKeyguardViewManagerTest
Change-Id: I0ababa6b69cdc3fea558c063a8d3839172470ee1
2022-05-24 11:31:46 -04:00
Joanne Chung
dc6baeb264
Merge "Use autofill specific dialog background" into tm-dev am: 7aee7c8232 am: 6cfe6e2751
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570246
Change-Id: Idb4e40669ec0093d76f363c3a8d1b2986d3f0a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 15:21:54 +00:00
Mady Mellor
772f09fe07
Merge changes I282ed7eb,I4e9ca9ed into tm-dev
...
* changes:
Fix a padding issue for bubble user education in RTL
Fix position of bubble education views on large screen in RTL
2022-05-24 15:14:43 +00:00
Joanne Chung
6cfe6e2751
Merge "Use autofill specific dialog background" into tm-dev am: 7aee7c8232
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570246
Change-Id: I4b3c8030cff1de017f28f4b76fb321e31e16d779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 14:48:12 +00:00
Joanne Chung
7aee7c8232
Merge "Use autofill specific dialog background" into tm-dev
2022-05-24 14:23:41 +00:00
Matt Pietal
1736839a69
Merge "[LockScreen] Update bar state in NPVC." into tm-dev am: 468ccad0f6 am: 04c8307b4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18565167
Change-Id: I1fed977891faaa0622a95dcad860f0b4827326b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 14:22:43 +00:00
Matt Pietal
04c8307b4b
Merge "[LockScreen] Update bar state in NPVC." into tm-dev am: 468ccad0f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18565167
Change-Id: I53a35ece2fca66f4a4db8233359a48f02e454bff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 14:03:09 +00:00
Matt Pietal
80aeafc595
Fix bouncer flicker on lockscreen shade transition
...
Both CentralSurfacesImpl and StatusBarKeyguardViewManager are
attempting to control bouncer visibility on shade collapse, leading to
potential conflict. Let StatusBarKeyguardViewManager handle this
scenario.
Fixes: 232948170
Test: From home, power off, power on, swipe down to see notifs, swipe up
Change-Id: I1a1ad69b71887052eb208d6d6c1f3b7783a1834a
2022-05-24 09:45:58 -04:00
Matt Pietal
468ccad0f6
Merge "[LockScreen] Update bar state in NPVC." into tm-dev
2022-05-24 13:41:26 +00:00
TreeHugger Robot
f50591c036
Merge "Do not resolve activity creation if it is in unknown TaskFragment" into tm-dev am: 327887fad9 am: ef17f29be0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482930
Change-Id: I15badec21bb7a60ead9d8099510996bb5ef8f658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 11:55:30 +00:00
TreeHugger Robot
a8dacea460
Merge "Sync insets leash position with shell seamless rotation" into tm-qpr-dev
2022-05-24 11:50:14 +00:00