Mady Mellor
0f7c6bbd4e
Merge "Don't use SysUI ScrimController for bubbles" into sc-v2-dev
2021-07-29 22:36:54 +00:00
Mady Mellor
31075face6
Don't use SysUI ScrimController for bubbles
...
Changes for the manage menu will require a scrim between the expanded
view and the manage menu.
I think it makes sense to just have BubbleStackView control the
scrims entirely rather than have 1 in ScrimController and 1 in
BubbleStackView (or 2 scrims in ScrimController).
Test: manual - expand a bubble, there's a scrim behind it, collapse
the bubble, the scrim is gone.
Bug: 183658858
Change-Id: I537c910b959ab938eb1d116d9dc0c801006dbb79
2021-07-29 12:46:10 -07:00
Automerger Merge Worker
8af8f813b2
Merge "Merge "TouchExplorerTest: fix run error." into sc-dev am: 1219bfb27f" into sc-v2-dev
2021-07-29 19:16:21 +00:00
Riddle Hsu
3592ca1095
Merge "Wait for notification shade to redraw on orientation change" into sc-dev am: 7b4e645ce0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401463
Change-Id: I99518266901ddfd1a1f74947f66bdc7681d3b942
2021-07-29 19:16:15 +00:00
Ameer Armaly
e2b1177843
Merge "TouchExplorerTest: fix run error." into sc-dev am: 1219bfb27f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15374641
Change-Id: I56be67470d8bba595e940026099192cf0e2c8752
2021-07-29 19:16:09 +00:00
Ameer Armaly
7792448c62
Merge "TouchExplorerTest: fix run error." into sc-dev am: 1219bfb27f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15374641
Change-Id: I883726fbe897180cdf4f17a9e748166ce73da334
2021-07-29 19:16:02 +00:00
Daniel Sandler
dc6b11e2cc
Merge "Fix missing exported=true in manifest." into sc-dev am: 299c0567a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15407912
Change-Id: I9b14b74c3b699cefaed670474fef7f0091859aec
2021-07-29 19:15:51 +00:00
Daniel Solomon
070300e858
Merge "Revert "SCREEN_BRIGHTNESS - map 255 to current max"" into sc-dev am: d5e1458566
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404418
Change-Id: Ie65fbb748337a030492d515bbea94c551398b5f5
2021-07-29 19:15:35 +00:00
Joe Bolinger
4b492c376c
Merge "Prevent fingerprint icon from showing when unlocking while fingerprint is in lockout." into sc-dev am: 598a7988be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15379177
Change-Id: I93c93bd7da3047e16da09f2d7c7a70ee5d0f6179
2021-07-29 19:15:07 +00:00
Jay Aliomer
c9a1208fb5
Merge "WallpaperService crashes becuase of a log statement" into sc-dev am: c2d9287c97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403905
Change-Id: I467a74c250473e45fe76db8ad5ee064b6328e1e9
2021-07-29 19:14:54 +00:00
Antoan Angelov
4dc8c7de32
Merge "Revert "Revert "Revert "Revert "Launch admin policies settings screen if not possible to""" into sc-dev am: da685b239c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390555
Change-Id: I3fd53e20d26842f087518281531d09d553a3bbcc
2021-07-29 19:14:45 +00:00
Fabian Kozynski
10fc0e6675
Merge "Save space in small width screens" into sc-dev am: 842ebcdb44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377398
Change-Id: Ic453ae258ce0889005182a225ef82fc8231e0a5f
2021-07-29 19:14:31 +00:00
Beverly Tai
569f11095c
Merge "Only set userHasDeviceEntryIntent on keyguard" into sc-dev am: ebe9e34fbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403138
Change-Id: I0f47940691488dc6b57207f4510051f3884e6155
2021-07-29 19:14:17 +00:00
TreeHugger Robot
5a711d321e
Merge "Fix ANR when switching the app task but IME selection dialog focused" into sc-dev am: 1181f3e9aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15398716
Change-Id: Ib9ff638ecba68afd01a9a74d2cd8a6b507d94445
2021-07-29 19:13:55 +00:00
Benedict Wong
66657e13ee
Merge "Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgents" into sc-dev am: 9eee7d3f29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15344043
Change-Id: I95583dcea69d627eefc6074f50efd0f152d7b7d6
2021-07-29 19:13:30 +00:00
Arthur Hung
c51bd5ff66
Merge "Keeps power key intercepted during a panic gesture" into sc-dev am: 4ee67cf14e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15389276
Change-Id: I4ec95e79561cd1fe82b9f5075119f94f5d1b8b1d
2021-07-29 19:12:53 +00:00
Sungsoo Lim
974009717b
Merge "Revert "[Media ML] Replace AudioSystem.isActiveStream"" into sc-dev am: 75fa0482a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390764
Change-Id: I5d0e0e4a06327f4b26add392f226d000f14e21fb
2021-07-29 19:12:35 +00:00
Automerger Merge Worker
3ec46b45fa
Merge "Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev am: af04dd2ad5" into sc-v2-dev
2021-07-29 19:12:28 +00:00
Hai Zhang
624b9edc31
Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev am: af04dd2ad5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302018
Change-Id: I70bd4b157bd66e794c0f9321ec83ef845b318b44
2021-07-29 19:12:19 +00:00
Hai Zhang
0f17f27c77
Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev am: af04dd2ad5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302018
Change-Id: I1bf40fe706b0f03443a8a6fbb6e8c84b0fa44402
2021-07-29 19:12:13 +00:00
Sungsoo Lim
bdaac48125
Merge "Do not pass the volume key event to remote sessions" into sc-dev am: f408df6338
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373618
Change-Id: Ibb3cdc53587dbefdc440fe3a2b5771d288865d0e
2021-07-29 19:09:58 +00:00
Guojing Yuan
a1c41c4616
Merge "Add permission check while creating CompanionDeviceService" into sc-dev am: dfa9b3058f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15394690
Change-Id: I320a13ba3a56fcb766e37e08909540f153816b3d
2021-07-29 19:09:43 +00:00
TreeHugger Robot
eb45bc8a97
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b68c209b8a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403217
Change-Id: I256149cac80687019010f10c98d7f22ae9934411
2021-07-29 19:09:30 +00:00
TreeHugger Robot
0f49f743e8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4616377708 -s ours am: c8db043d4b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403213
Change-Id: I90167305a59c82eef6faf8c44669b5951a04105b
2021-07-29 19:09:24 +00:00
TreeHugger Robot
3564de1bf4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8e18eeb56e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403215
Change-Id: Ia105dc693c08305091f1b84d6e3ea1d2238b8809
2021-07-29 19:09:18 +00:00
Automerger Merge Worker
f8d0c10fe7
Merge "Merge "Don't use Primary sensor when Secondary available." into sc-dev am: 00f16a796a" into sc-v2-dev
2021-07-29 19:09:08 +00:00
TreeHugger Robot
2fc3b447ef
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 94081b3687 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403219
Change-Id: I15fb5826abf3f7dfa200b9a5753a329839c6e70e
2021-07-29 19:09:04 +00:00
Dave Mankoff
892c552705
Merge "Don't use Primary sensor when Secondary available." into sc-dev am: 00f16a796a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377083
Change-Id: I06b5e1703c7e6de8f357350ca96c20f633ccbab4
2021-07-29 19:08:54 +00:00
Dave Mankoff
54b50f96e8
Merge "Don't use Primary sensor when Secondary available." into sc-dev am: 00f16a796a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377083
Change-Id: I71d5e8f2d4423a01ddc17dbefa9c92e406e711af
2021-07-29 19:08:50 +00:00
Kweku Adams
0c4349edb2
Merge "Address sorting edge case." into sc-dev am: ab3f902ccf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392295
Change-Id: Ia4f9f742cb2a84b8e94bca7b94b0b07399d27ccf
2021-07-29 19:08:21 +00:00
TreeHugger Robot
94557a7e3e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6dba3bc1e6 -s ours am: 06a68d9a72 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401890
Change-Id: I3f2409cf6e33dc6cce2ff305c46446fdff69cc45
2021-07-29 19:08:15 +00:00
Bill Yi
37db129380
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 468621bab9 -s ours am: bad6f056f3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401898
Change-Id: I098a724ad5a4975c51f90393999fdc05bd92a959
2021-07-29 19:08:11 +00:00
Bo Liu
83a2968876
Merge "ADPF: Handle preferred interval on unsupported device" into sc-dev am: 047d3ba17a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392128
Change-Id: I6915cbd3fd1e54c49fb6c93b2069cafb88b501b7
2021-07-29 19:08:07 +00:00
TreeHugger Robot
a231b5efb5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 27e6215f16 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401893
Change-Id: I0d5af73f4fef0188e456ba6fd1825418b976fe45
2021-07-29 19:07:54 +00:00
Jeff Sharkey
4ef89ede2f
Merge "Pass metadata as AttributionSourceSource." into sc-dev am: a57ee36d6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388734
Change-Id: I78badb0a5e3abd12c5306489eb89d4f7412d3527
2021-07-29 19:07:45 +00:00
Lyn Han
8fe507e6d9
Merge "Cancel existing QsClippingAnimation when creating new one" into sc-dev am: ea1871c7d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390005
Change-Id: Ied83d9a5a49874c93532ec2113020ffb9d5c9a46
2021-07-29 19:07:17 +00:00
Adam He
0d093f0328
Merge "Fix inline autofill not working if both afservice and keyboard support it, but keyboard disabled inline support manually." into sc-dev am: e31184cb46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362681
Change-Id: I8bcd5f7d301668d7895710b8277be25292456886
2021-07-29 19:06:39 +00:00
Julia Reynolds
e6e7e0470b
Merge "Add NMS broadcasts to protected list" into sc-dev am: 92145ddf77
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15393660
Change-Id: Ie80eb676bd9771d38a71c72839a98b4dd0724de3
2021-07-29 19:06:18 +00:00
Jason Chang
47abd6c2b2
Merge "Fix tutorial background color not up-to-date occasionally" into sc-dev am: 3ebd024a80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373613
Change-Id: I1cba57040d1b3d78a096f8336359fd0e3d64e52f
2021-07-29 19:06:03 +00:00
Peter Kalauskas
dd14d69322
Merge "Move guest creation to background thread" into sc-dev am: 2599b29073
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373286
Change-Id: I7a2b35294a56132834da0809b04034a94535d6f7
2021-07-29 19:05:36 +00:00
Bill Yi
772e546d9f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 170f2b6287 -s ours am: c78d905228 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15394508
Change-Id: Idc86f80acf64c374c18655c00b58301e01126bbe
2021-07-29 19:05:02 +00:00
Jeff DeCew
71588f71c4
Merge "Use correct stack height when bypass enabled." into sc-dev am: 44cd9995db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392213
Change-Id: I9057c9d59239eb42a53c07a8f53e4b382a72b91b
2021-07-29 19:04:56 +00:00
Sergey Volnov
f1d2441d74
Merge "Fix content capture not being usable from hotword detector." into sc-dev am: 78456de866
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15379071
Change-Id: I92eb770088aab0356e0510040eaf5f55c6e559d6
2021-07-29 19:04:17 +00:00
Alex Buynytskyy
dcbf05475e
Merge "Check for invalid (negative) string pool pos." into sc-dev am: 59bad728e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390628
Change-Id: Ie08ac7e816b906c224e0ee4ac573286535fa1ec6
2021-07-29 19:03:50 +00:00
Amruth Ramachandran
4f60b263bc
Merge "[PhysicalChannelConfig] UL's frequency should not be same with DL's" into sc-dev am: 4afa9546f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373617
Change-Id: Iafaf28b4fea42d73c3de2fbc995e1c2f4865bf43
2021-07-29 19:03:29 +00:00
Vadim Caen
44823207a4
Merge "Do not draw icon background if it shouldn't be seen" into sc-dev am: ee08a68fd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15175437
Change-Id: I99c182334636b3c9ce7bdc24b910d1b99bddb93a
2021-07-29 19:02:27 +00:00
Michał Brzeziński
21cb5e5b4b
Merge "Making mirror slider appear when brightness slider is used in split shade" into sc-v2-dev
2021-07-29 18:49:37 +00:00
András Klöczl
4c80c3bda3
Merge "Add new shell commands for DeviceStateChanged CTS test" into sc-v2-dev
2021-07-29 18:17:19 +00:00
Dave Mankoff
4f82ace23f
Merge "Move KeyguardStateController.Callback to field of StatusBar." into sc-v2-dev
2021-07-29 18:00:23 +00:00
Chilun Huang
5eb2ccc35b
Merge "Remove flaky annotation" into sc-v2-dev
2021-07-29 08:36:46 +00:00