Daniel Chapin
d9bd79f44b
Merge "Revert "Deferring visibility updates while applying WCT"" into sc-v2-dev am: 100b9f73e5 am: f0187aa354
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347902
Change-Id: I894c4523ed8a12784c5b72612f306f213ab24a83
2021-07-21 20:40:41 +00:00
Daniel Chapin
f0187aa354
Merge "Revert "Deferring visibility updates while applying WCT"" into sc-v2-dev am: 100b9f73e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347902
Change-Id: I9913fbeec08501c35bcdaacb58df6f84c9dd8089
2021-07-21 20:27:44 +00:00
Michael Ludwig
bc85a32cdd
Merge "Skip applying expanding clip ops in native canvas"
2021-07-21 20:18:57 +00:00
Daniel Chapin
100b9f73e5
Merge "Revert "Deferring visibility updates while applying WCT"" into sc-v2-dev
2021-07-21 20:13:54 +00:00
Fabian Kozynski
1957b48a26
[automerger skipped] Merge "Hide RSSI next to single carrier name" into sc-v2-dev am: 8a5c787b96 am: 1667dd3619 -s ours
...
am skip reason: Merged-In I8b80bb14b8f60872d44d5a92ddfa7c5903420874 with SHA-1 64172cbc5d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15337859
Change-Id: I47e459103aaef17406f5decf7c42015a1776d8ea
2021-07-21 19:29:02 +00:00
Joshua Mccloskey
780e6dcd2c
Merge "Remove all biometrics if user is removed." into sc-dev am: 755ca98ad4 am: 03483236d5 am: aaa88ae5d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15343273
Change-Id: I528857f37a8b5d4244e7a12524e31e7889093315
2021-07-21 19:28:44 +00:00
Evan Rosky
190feaf5c5
Merge "Fix some shell transitions bugs breaking splashscreen cts" into sc-v2-dev am: 317e669870 am: 795aea9658
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340839
Change-Id: I88013acc91747d50a3c6fe029570e2edfe2dfeb3
2021-07-21 19:28:32 +00:00
Fiona Campbell
a0bf4d8939
Merge "Add displayId to DPC logs" into sc-dev am: 1d509e2e21 am: fc031a9ada am: 88bbda9c26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15299315
Change-Id: Ib9f5c347bbcab768b60736780c3937cfed6fc73b
2021-07-21 19:28:11 +00:00
Ilya Matyukhin
359a38b923
Merge "Fix enrollment preview surface leak" into sc-dev am: 2151a28c7c am: f02dae3491 am: 622f14c389
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15246716
Change-Id: Ic36bb84b6b1aa22950f0aea5d70414e941cdfe1d
2021-07-21 19:27:52 +00:00
Yuncheol Heo
4640fb2434
Merge "Apply setAlwaysOnTop when recycling Task." into sc-v2-dev am: ee4ae77c5f am: 44399f20c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305884
Change-Id: Iba3e35fd45d02eb7caf2b019c232c79ba9e66c36
2021-07-21 19:27:33 +00:00
Silin Huang
3a752590dc
Recreate the Wallet client before query the wallet cards with a time am: afe1913257 am: c37bf4e5f6 am: 379ac00e3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315891
Change-Id: Ia3a4c24f41280fb78d7b2d1ee9965b28c0bd5bf6
2021-07-21 19:27:04 +00:00
Chris Li
65986c1e5d
Merge "Do not preload recents activity if it will be visible" into sc-v2-dev am: 5b7911b8a3 am: 56640cd192
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15319290
Change-Id: I81eff002588e95761c272e98715cce07895c4efe
2021-07-21 19:26:53 +00:00
Beverly Tai
635528adef
Merge "Rely on the dozeAmount changes for mIsDozing" into sc-dev am: 814655b18c am: c4fe720f11 am: f05867f696
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348030
Change-Id: I621eb7cc8d0681b405c25f6b8048705fe1b00521
2021-07-21 19:26:18 +00:00
Evan Severson
ea754706a9
Merge "Don't block intent if op is restricted due to toggles" into sc-dev am: 2b11e7f25c am: b88fa4135b am: 534ebbeec9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245178
Change-Id: Idc58d417f5526a03ae7a3394048a5d5e18733be0
2021-07-21 19:26:00 +00:00
Sunny Goyal
79d032178f
Merge "Accounting for image scaling when calculating color extraction" into sc-v2-dev am: f7f941743d am: 854a50690d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15342468
Change-Id: If6efddf980aa7cbc3e486909a2ff3b4c0c8d2fad
2021-07-21 19:25:44 +00:00
Josh Tsuji
0949bdcf97
Merge "Fix issue where screen off is disabled after expanding then collapsing the shade." into sc-dev am: 3d89666385 am: cc8ebcaf9d am: d3c9519ece
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340719
Change-Id: I9ca04ed82627f22bc312021ab732eed50f6feb48
2021-07-21 19:25:21 +00:00
Beverly Tai
3fef6df3d3
[automerger skipped] resolve merge conflicts of 1023c783d8 to sc-v2-dev-plus-aosp am: b4523a71c6 -s ours
...
am skip reason: Merged-In I621ea06984f17954e9be138e9e5669aeb3cfb3fe with SHA-1 06e6eeb04f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15346626
Change-Id: I4cb39be10d43b32b1d114a7c26b4719dbebd1912
2021-07-21 19:25:09 +00:00
TreeHugger Robot
afc5c55592
Merge "Remove @UnsupportedAppUsage from IInputConnectionWrapper#mInputConnection"
2021-07-21 19:24:24 +00:00
Fabian Kozynski
1667dd3619
Merge "Hide RSSI next to single carrier name" into sc-v2-dev am: 8a5c787b96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15337859
Change-Id: I1c458bc75189e5ba51399e62325edcdd626a966f
2021-07-21 19:20:28 +00:00
Joshua Mccloskey
aaa88ae5d6
Merge "Remove all biometrics if user is removed." into sc-dev am: 755ca98ad4 am: 03483236d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15343273
Change-Id: I4b40a5bfeca3f9c59fdc1b2ce8d119d5aeba9b2f
2021-07-21 19:20:06 +00:00
Evan Rosky
795aea9658
Merge "Fix some shell transitions bugs breaking splashscreen cts" into sc-v2-dev am: 317e669870
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340839
Change-Id: Ida7bb38d0da0bd5b059e7c85cd99aaa03ff2efb1
2021-07-21 19:19:37 +00:00
Fiona Campbell
88bbda9c26
Merge "Add displayId to DPC logs" into sc-dev am: 1d509e2e21 am: fc031a9ada
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15299315
Change-Id: I50cc0e889fe1ae4dcfe58ee2e257e05c4746ba8b
2021-07-21 19:19:05 +00:00
Ilya Matyukhin
622f14c389
Merge "Fix enrollment preview surface leak" into sc-dev am: 2151a28c7c am: f02dae3491
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15246716
Change-Id: I3fb96607d1977cf08a14bb71a24b364c62cb2662
2021-07-21 19:18:50 +00:00
Yuncheol Heo
44399f20c8
Merge "Apply setAlwaysOnTop when recycling Task." into sc-v2-dev am: ee4ae77c5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305884
Change-Id: I3e31cb5daf9253d83954fcabbca93de04e921045
2021-07-21 19:18:26 +00:00
Silin Huang
379ac00e3e
Recreate the Wallet client before query the wallet cards with a time am: afe1913257 am: c37bf4e5f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315891
Change-Id: Id55dbaaa99cd9bac0eb69e4cbb937af4b42306bc
2021-07-21 19:18:05 +00:00
Chris Li
56640cd192
Merge "Do not preload recents activity if it will be visible" into sc-v2-dev am: 5b7911b8a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15319290
Change-Id: I322c1ce27cd3cce21114f33267250ebe803ca0cc
2021-07-21 19:17:56 +00:00
Beverly Tai
f05867f696
Merge "Rely on the dozeAmount changes for mIsDozing" into sc-dev am: 814655b18c am: c4fe720f11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348030
Change-Id: Ic51cc10472f469b4ce7489831990efda1f37f0ce
2021-07-21 19:17:41 +00:00
Evan Severson
534ebbeec9
Merge "Don't block intent if op is restricted due to toggles" into sc-dev am: 2b11e7f25c am: b88fa4135b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245178
Change-Id: I6b983abe3ab13c386524b073832afe271390ad71
2021-07-21 19:17:26 +00:00
Sunny Goyal
854a50690d
Merge "Accounting for image scaling when calculating color extraction" into sc-v2-dev am: f7f941743d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15342468
Change-Id: Ic92d485b2fca34e2594405c092436e48deafbfd3
2021-07-21 19:16:56 +00:00
Josh Tsuji
d3c9519ece
Merge "Fix issue where screen off is disabled after expanding then collapsing the shade." into sc-dev am: 3d89666385 am: cc8ebcaf9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340719
Change-Id: I40b814898be63ca57b767b4b1eb60bc519eac644
2021-07-21 19:15:51 +00:00
Fabian Kozynski
8a5c787b96
Merge "Hide RSSI next to single carrier name" into sc-v2-dev
2021-07-21 19:12:01 +00:00
Kweku Adams
5f49564deb
Merge "Improve forEach."
2021-07-21 18:36:16 +00:00
Joshua Mccloskey
f0b055e65e
Merge "Remove all biometrics if user is removed." into sc-dev am: 755ca98ad4 am: fdfcafec5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15343273
Change-Id: Id02f94e0339c09e0a50dc761352e106a75cb16c8
2021-07-21 18:18:04 +00:00
Fiona Campbell
c7f20060d7
Merge "Add displayId to DPC logs" into sc-dev am: 1d509e2e21 am: 588c1d0bd1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15299315
Change-Id: I28c02eb4dd5f1167a588903ea374be1415c4f949
2021-07-21 18:17:50 +00:00
Joshua Mccloskey
03483236d5
Merge "Remove all biometrics if user is removed." into sc-dev am: 755ca98ad4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15343273
Change-Id: I103a114eb5e38195323940ef0f558e892fb25655
2021-07-21 18:17:22 +00:00
Ilya Matyukhin
ba2306125f
Merge "Fix enrollment preview surface leak" into sc-dev am: 2151a28c7c am: 5075d8d623
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15246716
Change-Id: I7991c66f5c486acaa3e2d5017e3510cb6645ed3d
2021-07-21 18:17:16 +00:00
Joshua Mccloskey
fdfcafec5b
Merge "Remove all biometrics if user is removed." into sc-dev am: 755ca98ad4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15343273
Change-Id: Ibc4e39f73f601953f22e4d355bfdb938b635e987
2021-07-21 18:16:45 +00:00
Joshua Mccloskey
755ca98ad4
Merge "Remove all biometrics if user is removed." into sc-dev
2021-07-21 18:14:01 +00:00
Evan Rosky
317e669870
Merge "Fix some shell transitions bugs breaking splashscreen cts" into sc-v2-dev
2021-07-21 18:01:08 +00:00
Fiona Campbell
fc031a9ada
Merge "Add displayId to DPC logs" into sc-dev am: 1d509e2e21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15299315
Change-Id: I26ef1c7c8ffad1cfb81d96cd43be4029d3e89bfd
2021-07-21 17:56:33 +00:00
Fiona Campbell
588c1d0bd1
Merge "Add displayId to DPC logs" into sc-dev am: 1d509e2e21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15299315
Change-Id: I5fb21fee7342af5e36c58148d92f890b7eb81e5e
2021-07-21 17:56:01 +00:00
Fabian Kozynski
66820d753e
Hide RSSI next to single carrier name
...
If there's exactly one SIM, do not show the RSSI next to the name in
QSBH. Instead, show it with the other icons. If there's more than one
SIM, show each RSSI next to the carrier name, and not with the other
icons (not even in QQS).
Test: atest com.android.systemui.qs
Test: manual single sim
Bug: 187654917
Bug: 194178072
Change-Id: I8b80bb14b8f60872d44d5a92ddfa7c5903420874
Merged-In: I8b80bb14b8f60872d44d5a92ddfa7c5903420874
2021-07-21 17:53:52 +00:00
Fiona Campbell
1d509e2e21
Merge "Add displayId to DPC logs" into sc-dev
2021-07-21 17:51:27 +00:00
Ilya Matyukhin
f02dae3491
Merge "Fix enrollment preview surface leak" into sc-dev am: 2151a28c7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15246716
Change-Id: Ia6c92a226d1fe7db3cf82c799145a7d773145352
2021-07-21 17:51:11 +00:00
Ilya Matyukhin
5075d8d623
Merge "Fix enrollment preview surface leak" into sc-dev am: 2151a28c7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15246716
Change-Id: I328f71c3c48b1b8d9b1efb89f33256c9b1dffe2a
2021-07-21 17:50:12 +00:00
Yuncheol Heo
ee4ae77c5f
Merge "Apply setAlwaysOnTop when recycling Task." into sc-v2-dev
2021-07-21 17:43:02 +00:00
Silin Huang
f347374338
Recreate the Wallet client before query the wallet cards with a time am: afe1913257 am: 6375f15177
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315891
Change-Id: I647d3bfcbdec2d07e8be4aa8d8cebd80934c51b1
2021-07-21 17:42:44 +00:00
Beverly Tai
084a4d63f3
Merge "Rely on the dozeAmount changes for mIsDozing" into sc-dev am: 814655b18c am: bc0ebf3fc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348030
Change-Id: Ic9d4cf82807de10b8b7262751622212b662dc109
2021-07-21 17:42:09 +00:00
Ilya Matyukhin
2151a28c7c
Merge "Fix enrollment preview surface leak" into sc-dev
2021-07-21 17:41:34 +00:00
Evan Severson
2e307d01ee
Merge "Don't block intent if op is restricted due to toggles" into sc-dev am: 2b11e7f25c am: e1aa2f69bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245178
Change-Id: Iac09812c27cffa659a6d7c8bd334ef8906e3ae5a
2021-07-21 17:41:21 +00:00