Marcin Oczeretko
7fafc77d61
Merge "Fix jank trigger name on non-english locales" into sc-dev am: 7c6032d0ed am: f51418fcc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14920937
Change-Id: If03ad1e3fdbe927c1d52b93384ba27ffdf7cfe58
2021-06-14 13:53:00 +00:00
Marcin Oczeretko
f51418fcc9
Merge "Fix jank trigger name on non-english locales" into sc-dev am: 7c6032d0ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14920937
Change-Id: I49e1db14cdbc2a89f5eb3e2034cf89b8b0b49325
2021-06-14 13:43:39 +00:00
Marcin Oczeretko
7c6032d0ed
Merge "Fix jank trigger name on non-english locales" into sc-dev
2021-06-14 13:28:03 +00:00
TreeHugger Robot
1127aab93b
Merge "Update text, colors, and suppression" into sc-dev am: 39e9e83e00 am: bea2b82c2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14937171
Change-Id: If38c990d3a3a3c7ac9489d51f8f73ac061c132b1
2021-06-14 13:04:08 +00:00
TreeHugger Robot
2fa47fc470
Merge "Update text, colors, and suppression" into sc-dev am: 39e9e83e00 am: 893c910bbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14937171
Change-Id: I7c9b3e53cb1278c51fa205b4bf1dcd52d1f9a466
2021-06-14 13:03:53 +00:00
TreeHugger Robot
893c910bbf
Merge "Update text, colors, and suppression" into sc-dev am: 39e9e83e00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14937171
Change-Id: If6367c48516ae7147bc714d14d112edd32453506
2021-06-14 12:41:17 +00:00
TreeHugger Robot
bea2b82c2c
Merge "Update text, colors, and suppression" into sc-dev am: 39e9e83e00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14937171
Change-Id: I3a508e1d5f2757c7f652cfcf62c12468946da8d4
2021-06-14 12:40:29 +00:00
TreeHugger Robot
39e9e83e00
Merge "Update text, colors, and suppression" into sc-dev
2021-06-14 12:28:00 +00:00
TreeHugger Robot
c1f59b7fc7
Merge "Animate launches from lockscreen" into sc-dev am: 33fae67fae am: 162d52dfdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934058
Change-Id: I02bc92587e143e27715dc4f2b181a360dfeb61a7
2021-06-14 12:05:13 +00:00
Michał Brzeziński
f046a00ad2
Merge "Adding automated test for ag/14874758" into sc-dev am: e896d41311 am: b13d0038d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881452
Change-Id: Id17a1876a168337a6f5faf2980bba640a119c531
2021-06-14 12:05:05 +00:00
TreeHugger Robot
e075793156
Merge "Animate launches from lockscreen" into sc-dev am: 33fae67fae am: aab4632a43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934058
Change-Id: Ie2dbaf9c0be5706a6f3139de9e47565c6e36176f
2021-06-14 12:04:51 +00:00
Michał Brzeziński
123a1ab095
Merge "Adding automated test for ag/14874758" into sc-dev am: e896d41311 am: f3546e9a7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881452
Change-Id: Ied6ba0f6818e024372504d24ad8b2b0771c3200b
2021-06-14 12:04:29 +00:00
TreeHugger Robot
aab4632a43
Merge "Animate launches from lockscreen" into sc-dev am: 33fae67fae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934058
Change-Id: I9ba7c0c7c6d4a63e19f240f763190a4c46495dd3
2021-06-14 11:49:46 +00:00
TreeHugger Robot
162d52dfdf
Merge "Animate launches from lockscreen" into sc-dev am: 33fae67fae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934058
Change-Id: I2dd6a605f587f298d5b4b7f482b8112850a6210c
2021-06-14 11:49:45 +00:00
Michał Brzeziński
f3546e9a7f
Merge "Adding automated test for ag/14874758" into sc-dev am: e896d41311
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881452
Change-Id: I50c597c02d4482c13328f93ebec3bcfa54925381
2021-06-14 11:49:41 +00:00
Michał Brzeziński
b13d0038d6
Merge "Adding automated test for ag/14874758" into sc-dev am: e896d41311
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881452
Change-Id: I7652c80253ba8c7a9eb36c77cfe43d5e4e04c6e5
2021-06-14 11:48:55 +00:00
TreeHugger Robot
33fae67fae
Merge "Animate launches from lockscreen" into sc-dev
2021-06-14 11:42:51 +00:00
Michał Brzeziński
e896d41311
Merge "Adding automated test for ag/14874758" into sc-dev
2021-06-14 11:30:21 +00:00
Kholoud Mohamed
dde42038be
Merge "Prevent ACTION_FACTORY_RESET from resetting device in a non-system user" into sc-dev am: 81980798fe am: ddb4f627c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717629
Change-Id: I299b0298360774e01ed0db8d6a822cd88a626e3c
2021-06-14 10:54:43 +00:00
Kholoud Mohamed
91abd917ff
Merge "Prevent ACTION_FACTORY_RESET from resetting device in a non-system user" into sc-dev am: 81980798fe am: c633643365
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717629
Change-Id: I926e6ddc99e2380ec6882b1973498f1cde58bad1
2021-06-14 10:43:16 +00:00
Kholoud Mohamed
c633643365
Merge "Prevent ACTION_FACTORY_RESET from resetting device in a non-system user" into sc-dev am: 81980798fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717629
Change-Id: Ic45dc5f94e5b5cd63deef1466ab670b50f4874eb
2021-06-14 10:39:51 +00:00
TreeHugger Robot
eafa4b3622
Merge "Update scrims when changing quick settings clip, fix clipping bounds in split shade" into sc-v2-dev am: 6b484c26fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14900241
Change-Id: Idf86dd17fbd2392a3c09a01991bd5d6f711b44dd
2021-06-14 10:39:19 +00:00
Kholoud Mohamed
ddb4f627c2
Merge "Prevent ACTION_FACTORY_RESET from resetting device in a non-system user" into sc-dev am: 81980798fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717629
Change-Id: I4d5f4a02ea0859ea210fe1425fbc7403f2b32b28
2021-06-14 10:38:48 +00:00
TreeHugger Robot
6b484c26fc
Merge "Update scrims when changing quick settings clip, fix clipping bounds in split shade" into sc-v2-dev
2021-06-14 10:27:09 +00:00
Kholoud Mohamed
81980798fe
Merge "Prevent ACTION_FACTORY_RESET from resetting device in a non-system user" into sc-dev
2021-06-14 10:24:48 +00:00
Jordan Demeulenaere
d5c5517416
Animate launches from lockscreen
...
Bug: 172048407
Test: Tap notification, media, QS, etc from lockscreen
Change-Id: I361aadc18b24375173f3bcea9dc1de0c13c803df
2021-06-14 12:00:01 +02:00
Kholoud Mohamed
188fe080df
Merge "Fix security vulnerability in DPMS" into sc-dev am: 58d0a17836 am: 013e3748c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919135
Change-Id: I403906c810073188ac23ab3a0b519c9f75e1a623
2021-06-14 09:45:38 +00:00
Kholoud Mohamed
fd2f02e94d
Merge "Fix security vulnerability in DPMS" into sc-dev am: 58d0a17836 am: 4dd90319ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919135
Change-Id: I1523f5a849b8bbaa38ba7b6e3ec11c2a25c616a1
2021-06-14 09:45:27 +00:00
Kholoud Mohamed
4dd90319ad
Merge "Fix security vulnerability in DPMS" into sc-dev am: 58d0a17836
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919135
Change-Id: I177845b6dbdde307752cd0af5b84bfc1b5a5e768
2021-06-14 09:29:46 +00:00
Kholoud Mohamed
013e3748c3
Merge "Fix security vulnerability in DPMS" into sc-dev am: 58d0a17836
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919135
Change-Id: Ia405b5ed58d9eca1d4b8431f5adc52d565e6a1c3
2021-06-14 09:29:00 +00:00
Kholoud Mohamed
58d0a17836
Merge "Fix security vulnerability in DPMS" into sc-dev
2021-06-14 09:11:57 +00:00
Anh Pham
df43483552
Merge "Throw Exception only if sensors are in capped set." into sc-dev am: e55a9d9036 am: bce57b1f76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934050
Change-Id: I15618a944aafd4d6d8fcdfae1f794214f8275233
2021-06-14 08:33:38 +00:00
Selim Cinek
3b1da055fc
Merge "Always do the app reveal animation when dismissing the splash screen" into sc-dev am: bfa0487b7a am: 582d79a7c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934416
Change-Id: Ie95403f3acba432e3adbb6c670082d3864a50c09
2021-06-14 08:33:30 +00:00
Anh Pham
2720931220
Merge "Throw Exception only if sensors are in capped set." into sc-dev am: e55a9d9036 am: 123e88c56f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934050
Change-Id: I725d7a2efdaec2a4eeb5a670e8996d72ec359a0a
2021-06-14 08:33:14 +00:00
Selim Cinek
bcee98b3b3
Merge "Always do the app reveal animation when dismissing the splash screen" into sc-dev am: bfa0487b7a am: b77c0a3d8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934416
Change-Id: I8d3c9409f66d28e749f41bd7852816836c3d44a7
2021-06-14 08:33:03 +00:00
Anh Pham
123e88c56f
Merge "Throw Exception only if sensors are in capped set." into sc-dev am: e55a9d9036
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934050
Change-Id: I878e4beee825fca95c2a7f2dd1ec61e101d762d1
2021-06-14 08:20:05 +00:00
Selim Cinek
b77c0a3d8a
Merge "Always do the app reveal animation when dismissing the splash screen" into sc-dev am: bfa0487b7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934416
Change-Id: Id5d4519dd0c96ee044a31c5ecac97cfd644d5cc5
2021-06-14 08:19:26 +00:00
Anh Pham
bce57b1f76
Merge "Throw Exception only if sensors are in capped set." into sc-dev am: e55a9d9036
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934050
Change-Id: I6073ec280f357fc0c1afee834ce61af19ebd9e69
2021-06-14 08:19:20 +00:00
Selim Cinek
582d79a7c8
Merge "Always do the app reveal animation when dismissing the splash screen" into sc-dev am: bfa0487b7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934416
Change-Id: I4d24531a8610acccc87ab5ed1ca850d40b09b4f3
2021-06-14 08:18:54 +00:00
Anh Pham
e55a9d9036
Merge "Throw Exception only if sensors are in capped set." into sc-dev
2021-06-14 08:04:42 +00:00
Selim Cinek
bfa0487b7a
Merge "Always do the app reveal animation when dismissing the splash screen" into sc-dev
2021-06-14 08:02:08 +00:00
Jordan Demeulenaere
547d416baa
Merge "Fix the media launch animation on lockscreen" into sc-dev am: f0b8563020 am: f343178446
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934053
Change-Id: Ic8377736485a1c8542b594e6e837b79f876d8315
2021-06-14 07:52:15 +00:00
Jordan Demeulenaere
c6d49fa4f1
Merge "Fix the media launch animation on lockscreen" into sc-dev am: f0b8563020 am: 2103705152
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934053
Change-Id: If643a39e63c2b57f86bab56c20fdb0b26e8d6a8c
2021-06-14 07:51:54 +00:00
kholoud mohamed
a0c10672e9
Prevent ACTION_FACTORY_RESET from resetting device in a non-system user
...
If ACTION_FACTORY_RESET was sent from a non-system user, remove the
user/profile, UserManager#removeUser correctly handles the case when a
restriction is set to not remove the profile/user by the admin.
Test: atest MasterClearReceiverTest
Test: manual testing
Bug: 175300681
Change-Id: Iea99e22534c9b6c1464321984b80c7406c62b86c
2021-06-14 07:45:58 +00:00
Jordan Demeulenaere
2103705152
Merge "Fix the media launch animation on lockscreen" into sc-dev am: f0b8563020
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934053
Change-Id: I535abc9f9854807b4f0b80f47cd4ce683eca0891
2021-06-14 07:40:07 +00:00
Jordan Demeulenaere
f343178446
Merge "Fix the media launch animation on lockscreen" into sc-dev am: f0b8563020
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934053
Change-Id: If29f9cf36721f2bdaf06c6ecc94369806d3bbd93
2021-06-14 07:38:58 +00:00
Jordan Demeulenaere
f0b8563020
Merge "Fix the media launch animation on lockscreen" into sc-dev
2021-06-14 07:28:00 +00:00
Issei Suzuki
3f6380219f
Merge changes I4dae426c,I3e45ca52,I46879ef8,I81cf31fe into sc-dev am: a54db49a49 am: ad7c34b92b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14519409
Change-Id: Iede6ea00fa549940b5a42af72178f4637b1dbb03
2021-06-14 07:09:45 +00:00
Issei Suzuki
81d6a4da39
Merge changes I4dae426c,I3e45ca52,I46879ef8,I81cf31fe into sc-dev am: a54db49a49 am: b1a1326e61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14519409
Change-Id: Ibc3c31a2eb13c99e594fd3d293e5ed6915cad1f0
2021-06-14 07:09:16 +00:00
Issei Suzuki
b1a1326e61
Merge changes I4dae426c,I3e45ca52,I46879ef8,I81cf31fe into sc-dev am: a54db49a49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14519409
Change-Id: I4e18808ff091660e878cb3128bef11b3bdd468ec
2021-06-14 06:57:52 +00:00