Commit Graph

662314 Commits

Author SHA1 Message Date
Beverly Tai
452e060790 Merge "Add gravity center to layout params" into sc-dev am: 98a4967908 am: 726af90667
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15411507

Change-Id: I27c9d0a59621169c724bfda6c0a29625942ccb95
2021-07-30 00:15:56 +00:00
Jeff DeCew
730b4ffe99 Merge "Fix bug removing semantic colors of CallStyle notification actions." into sc-dev am: 4203db854f am: 9da83c7285
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405173

Change-Id: Id7d9dc3cbce68a74060c901fb55fd2b0baaf0e09
2021-07-30 00:15:31 +00:00
TreeHugger Robot
51f19d8d91 Merge "Merge "For devices with udfps, always show bg on udfps" into sc-dev am: d2e60974cb am: 041083adec" into sc-v2-dev-plus-aosp 2021-07-30 00:12:17 +00:00
Mady Mellor
9fb1499dba Merge "Don't use SysUI ScrimController for bubbles" into sc-v2-dev am: 0f7c6bbd4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413213

Change-Id: I2f15459b3155484eeef16ddc126055ba4c3ed29e
2021-07-29 22:46:36 +00:00
Mady Mellor
0f7c6bbd4e Merge "Don't use SysUI ScrimController for bubbles" into sc-v2-dev 2021-07-29 22:36:54 +00:00
Beverly Tai
726af90667 Merge "Add gravity center to layout params" into sc-dev am: 98a4967908
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15411507

Change-Id: I3b9263a171a9c61db45ff9fcc8ceaa43cd5df9ed
2021-07-29 21:29:32 +00:00
Beverly Tai
44237aeedc Merge "For devices with udfps, always show bg on udfps" into sc-dev am: d2e60974cb am: 041083adec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392265

Change-Id: I742c8fc874ba7595171d37639018d0ade7464402
Merged-In: I5a19d3cd45c51af78a49d46126fc0678a3df6d6c
2021-07-29 20:58:08 +00:00
Beverly Tai
98a4967908 Merge "Add gravity center to layout params" into sc-dev 2021-07-29 20:57:30 +00:00
Jeff DeCew
9da83c7285 Merge "Fix bug removing semantic colors of CallStyle notification actions." into sc-dev am: 4203db854f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405173

Change-Id: I0aab8ac3c1a29c22751f33e7f699db73ff8389e6
2021-07-29 20:37:09 +00:00
Jeff DeCew
4203db854f Merge "Fix bug removing semantic colors of CallStyle notification actions." into sc-dev 2021-07-29 20:24:37 +00:00
Beverly Tai
041083adec Merge "For devices with udfps, always show bg on udfps" into sc-dev am: d2e60974cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392265

Change-Id: Ia0c3650aaa8b8b29c3435b672f61199d7ac2dc60
2021-07-29 20:06:50 +00:00
Beverly Tai
d2e60974cb Merge "For devices with udfps, always show bg on udfps" into sc-dev 2021-07-29 19:58:14 +00:00
Automerger Merge Worker
715e7fdf5e Merge "Merge "TouchExplorerTest: fix run error." into sc-dev am: 1219bfb27f" into sc-v2-dev am: 8af8f813b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15374641

Change-Id: I2ba66ee0b0f39c4e7208d6133c0516cba50c5934
2021-07-29 19:50:13 +00:00
Riddle Hsu
1280113aee Merge "Wait for notification shade to redraw on orientation change" into sc-dev am: 7b4e645ce0 am: 3592ca1095
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401463

Change-Id: I5ea69c70bb42cf733a2d101606df1d02aef99af5
2021-07-29 19:49:45 +00:00
Ameer Armaly
36a5994703 Merge "TouchExplorerTest: fix run error." into sc-dev am: 1219bfb27f am: 7792448c62
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15374641

Change-Id: I08d67d72c3744279906011305fea07ccca8ba8c7
2021-07-29 19:49:26 +00:00
Daniel Sandler
620997c49e Merge "Fix missing exported=true in manifest." into sc-dev am: 299c0567a5 am: dc6b11e2cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15407912

Change-Id: Icdbe77839cd566b495ee725dc35e21986424665c
2021-07-29 19:48:54 +00:00
Daniel Solomon
7a810b6914 Merge "Revert "SCREEN_BRIGHTNESS - map 255 to current max"" into sc-dev am: d5e1458566 am: 070300e858
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404418

Change-Id: I6a7bb364f5453e557a262037ab930ec007c1ee44
2021-07-29 19:48:23 +00:00
Joe Bolinger
4a51508241 Merge "Prevent fingerprint icon from showing when unlocking while fingerprint is in lockout." into sc-dev am: 598a7988be am: 4b492c376c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15379177

Change-Id: Ib89973456662f66207ed52ce33362d32c9611d4a
2021-07-29 19:48:02 +00:00
Jay Aliomer
127f5bdab5 Merge "WallpaperService crashes becuase of a log statement" into sc-dev am: c2d9287c97 am: c9a1208fb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403905

Change-Id: I38fd74e4b52fba3babe7efd9abfcf8b3a39f7e08
2021-07-29 19:47:47 +00:00
Antoan Angelov
45a3095ef4 Merge "Revert "Revert "Revert "Revert "Launch admin policies settings screen if not possible to""" into sc-dev am: da685b239c am: 4dc8c7de32
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390555

Change-Id: Ic1ee3383f4879f5719285448fa0294289540763a
2021-07-29 19:47:31 +00:00
Fabian Kozynski
b0c03f3a2f Merge "Save space in small width screens" into sc-dev am: 842ebcdb44 am: 10fc0e6675
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377398

Change-Id: Ie6380c48c2dae5cac14e0e8f8df1886340b92640
2021-07-29 19:46:48 +00:00
Beverly Tai
448d2ced84 Merge "Only set userHasDeviceEntryIntent on keyguard" into sc-dev am: ebe9e34fbb am: 569f11095c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403138

Change-Id: I5fef5ec37609bba8fcaaef684691e61635b814a9
2021-07-29 19:46:17 +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
TreeHugger Robot
8530d3aea2 [automerger skipped] Merge "Fix ANR when switching the app task but IME selection dialog focused" into sc-dev am: 1181f3e9aa am: 5a711d321e -s ours
am skip reason: Merged-In Iae3dd713b1e980067d28debea4e0a03707aa7938 with SHA-1 14f2c733b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15398716

Change-Id: I32372eb34d7996047999aa457aba7bc430f2c0ac
2021-07-29 19:45:30 +00:00
Benedict Wong
af3e183b1d [automerger skipped] Merge "Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgents" into sc-dev am: 9eee7d3f29 am: 66657e13ee -s ours
am skip reason: Merged-In I3a298a6c4c594c6e224f3f05764614802c00e9b0 with SHA-1 8d35744f98 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15344043

Change-Id: Ia25f78a1fdc0d18cb7d403127ede8ecfcc606eb0
2021-07-29 19:44:56 +00:00
Arthur Hung
df70e8f55a Merge "Keeps power key intercepted during a panic gesture" into sc-dev am: 4ee67cf14e am: c51bd5ff66
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15389276

Change-Id: Ic99a85dc98223eb828bd2cd2fda6401cfe41f3f0
2021-07-29 19:43:23 +00:00
Sungsoo Lim
67ea6dd350 Merge "Revert "[Media ML] Replace AudioSystem.isActiveStream"" into sc-dev am: 75fa0482a6 am: 974009717b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390764

Change-Id: I86f16c090af6f12be87b8c055da4edc50760fe71
2021-07-29 19:43:00 +00:00
Automerger Merge Worker
8ad22adfda Merge "Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev am: af04dd2ad5" into sc-v2-dev am: 3ec46b45fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302018

Change-Id: I964519b59012def1920f9fdbabefb9f01186fa1f
2021-07-29 19:42:17 +00:00
Hai Zhang
2804da85eb Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev am: af04dd2ad5 am: 0f17f27c77
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302018

Change-Id: Ia697794a85e18248eb5e49d36bb038402c20f6a4
2021-07-29 19:37:28 +00:00
Sungsoo Lim
d835195742 Merge "Do not pass the volume key event to remote sessions" into sc-dev am: f408df6338 am: bdaac48125
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373618

Change-Id: I084845e05dc4eebdcef8ad4a9ca25f6e67edf05a
2021-07-29 19:37:05 +00:00
Guojing Yuan
405f9ff870 Merge "Add permission check while creating CompanionDeviceService" into sc-dev am: dfa9b3058f am: a1c41c4616
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15394690

Change-Id: Ia8b071b7fb93447627fdc023b160fa99ad1b4967
2021-07-29 19:36:47 +00:00
TreeHugger Robot
126ee1ee2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b68c209b8a -s ours am: eb45bc8a97 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403217

Change-Id: Id1d91af26aa55dedb20f569bb165dee1ee8a6a64
2021-07-29 19:36:32 +00:00
TreeHugger Robot
0752b5fc80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4616377708 -s ours am: c8db043d4b -s ours am: 0f49f743e8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403213

Change-Id: Iba4aa8b902ada003ade938a55667ec4ffddfa6e5
2021-07-29 19:36:21 +00:00
TreeHugger Robot
fb1dd6b46a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8e18eeb56e -s ours am: 3564de1bf4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403215

Change-Id: Ib7c28d2f00544fdeb0fdc24df9bc42d48f9c6ee9
2021-07-29 19:36:11 +00:00
Automerger Merge Worker
7d563042a6 Merge "Merge "Don't use Primary sensor when Secondary available." into sc-dev am: 00f16a796a" into sc-v2-dev am: f8d0c10fe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377083

Change-Id: Ic16a9c00d913137b6a9c69d11d00afef419987ff
2021-07-29 19:36:00 +00:00
TreeHugger Robot
6de4b47e9b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 94081b3687 -s ours am: 2fc3b447ef -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403219

Change-Id: I26cbf4a53404b45ed81d2ee6a5b645807f2586ce
2021-07-29 19:35:32 +00:00
Dave Mankoff
2d1d0bd045 Merge "Don't use Primary sensor when Secondary available." into sc-dev am: 00f16a796a am: 892c552705
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377083

Change-Id: Ie2b347089ad52036e8ffb2ec5ce1deb1537dc0f6
2021-07-29 19:34:55 +00:00
Kweku Adams
1b9772f593 Merge "Address sorting edge case." into sc-dev am: ab3f902ccf am: 0c4349edb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392295

Change-Id: Ia40b80e65daffb9e67c67c1ccac327f23d54481d
2021-07-29 19:34:37 +00:00
TreeHugger Robot
b5b2cf904c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6dba3bc1e6 -s ours am: 06a68d9a72 -s ours am: 94557a7e3e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401890

Change-Id: I92a0f83bcf0e39f15ff31e11656595257679d736
2021-07-29 19:34:06 +00:00
Bill Yi
68f718da3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 468621bab9 -s ours am: bad6f056f3 -s ours am: 37db129380 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401898

Change-Id: Ifccbfa092a53fb4357e9a0443aa80840cf4acf9c
2021-07-29 19:33:48 +00:00
Bo Liu
be352ce3d9 Merge "ADPF: Handle preferred interval on unsupported device" into sc-dev am: 047d3ba17a am: 83a2968876
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392128

Change-Id: I08d9296c03a1a335ccefb17ddaf7ff3e09295ce6
2021-07-29 19:33:27 +00:00
TreeHugger Robot
0e197fb872 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 27e6215f16 -s ours am: a231b5efb5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401893

Change-Id: I2c8acdf1c2c5230559b5de3cc2de47856df859c7
2021-07-29 19:33:00 +00:00
Jeff Sharkey
925ce3b653 Merge "Pass metadata as AttributionSourceSource." into sc-dev am: a57ee36d6c am: 4ef89ede2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388734

Change-Id: I1b3cf1300ac75543c64f8966de1bd1357f8bf4f0
2021-07-29 19:32:37 +00:00
Lyn Han
d0e94856c7 Merge "Cancel existing QsClippingAnimation when creating new one" into sc-dev am: ea1871c7d2 am: 8fe507e6d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390005

Change-Id: I9e63596dd0c1a53a0bc5f5d49c09ffa3704da736
2021-07-29 19:32:07 +00:00
Adam He
e0724ac7b3 Merge "Fix inline autofill not working if both afservice and keyboard support it, but keyboard disabled inline support manually." into sc-dev am: e31184cb46 am: 0d093f0328
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362681

Change-Id: Idb05f83e60168bd9e542c86cfbd84842c9e6ea12
2021-07-29 19:31:35 +00:00
Julia Reynolds
49e29c1b63 Merge "Add NMS broadcasts to protected list" into sc-dev am: 92145ddf77 am: e6e7e0470b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15393660

Change-Id: I3d3133e7932db1ba5aa367f592fc26e0f50f5f2a
2021-07-29 19:30:49 +00:00
Jason Chang
5284dbbd42 Merge "Fix tutorial background color not up-to-date occasionally" into sc-dev am: 3ebd024a80 am: 47abd6c2b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373613

Change-Id: Icc92945e6231dd26d851ef695aa73a30e00dc0af
2021-07-29 19:30:26 +00:00
Peter Kalauskas
66f6aaad5b Merge "Move guest creation to background thread" into sc-dev am: 2599b29073 am: dd14d69322
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373286

Change-Id: I31642131d43bf0d2dddea6cd471b8421446ac8c4
2021-07-29 19:30:06 +00:00
Bill Yi
253637c01e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 170f2b6287 -s ours am: c78d905228 -s ours am: 772e546d9f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15394508

Change-Id: Ic7bd2de94d7d7c370a6cd89c23eeb65e2afe5d0f
2021-07-29 19:29:33 +00:00
Jeff DeCew
8c1976c08a Merge "Use correct stack height when bypass enabled." into sc-dev am: 44cd9995db am: 71588f71c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392213

Change-Id: I903714bac9104f8b4e27c560b9370c0b12df517e
2021-07-29 19:29:12 +00:00