Commit Graph

661587 Commits

Author SHA1 Message Date
Louis Chang
7b80ef8862 Merge "Fix showing duplicated recent tasks in Recents" into sc-v2-dev am: fcbb6a51c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15360452

Change-Id: I4b200b6a6d4954dd024c088486697b091eebc2c7
2021-07-27 01:34:35 +00:00
Louis Chang
fcbb6a51c0 Merge "Fix showing duplicated recent tasks in Recents" into sc-v2-dev 2021-07-27 01:20:37 +00:00
Josh Tsuji
9ddaf7f8a6 Merge "Reset to LiftReveal when going to sleep due to timing out, after a biometric auth." into sc-dev am: 7db2ece5c7 am: 65c089de51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362342

Change-Id: I57e276b24afe46b2662c3093d7e6d9c964c23cc8
2021-07-26 19:20:55 +00:00
Siim Sammul
d75cbc78c4 Merge "Do not make a getThreadTimeMicro() call when it is not needed. This was accidentally changed with https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080830" into sc-dev am: 6c852aeabc am: b77fb08506
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15346904

Change-Id: I6552265f9258ea772b1774d00bd884cc2d530202
2021-07-26 19:19:05 +00:00
Shubang Lu
b4467c0ff4 Merge "Change default value from NONE to UNKNOWN" into sc-dev am: 8e31f85e02 am: 52fe97fab4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377214

Change-Id: I5943464abd2dded5b6aca15abde86be170290073
2021-07-26 19:11:08 +00:00
Ahaan Ugale
2384fab251 Merge changes I212ad58c,Idf5dd82d into sc-dev am: 0e3d3b90ec am: fde50b97b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15360457

Change-Id: Iea70dd25f156cce2ec5d160562644dfd1dee8bbb
2021-07-26 19:10:54 +00:00
Alison Cichowlas
993c186923 Merge "Sharesheet: remove 2 separators, restyle the 3rd." into sc-dev am: 832779a555 am: fa25c27e48
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377016

Change-Id: I6d5563833b41f0f0221bbbc4fa71aedf5eb494d0
2021-07-26 19:10:45 +00:00
Evan Severson
7d033ae737 Merge "Update mic/cam quicksetting toggles when user changes" into sc-dev am: 4e09234999 am: 2d7542e78a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15365189

Change-Id: I89a9469178f72c9b84d8b97ad10b7b38e94fd9e7
2021-07-26 19:10:32 +00:00
TreeHugger Robot
7bf4a2e1cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ef631b164a -s ours am: f4b27a4b99 -s ours am: 5e70e746d9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8ff39929f99c72477e0d038588769e724769943
2021-07-26 19:10:24 +00:00
TreeHugger Robot
90b36e37d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 610c28b301 -s ours am: e0815935a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I863517946f5b2ccd73cc4f3ce3c2adcfd35d35f7
2021-07-26 19:10:19 +00:00
TreeHugger Robot
4695d98875 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bc138220ac -s ours am: db0c120536 -s ours am: 94a376aa1b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a9955469bfa7f4fe4aabb9fe05c60c12f3daf93
2021-07-26 19:10:12 +00:00
TreeHugger Robot
15d1ab8e3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9f54adfa3f -s ours am: 53c39e80b8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0dc3a8743bf408bf7749716ea2dd03d5b2a3e91c
2021-07-26 19:10:07 +00:00
Ahaan Ugale
d2a76b46f3 Merge "Add null pointer check for callback in HotwordDetectionConnection." into sc-dev am: f569f09b5a am: 7de35ab5c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15327988

Change-Id: Ib0737a7a9eaacc79da6c4688b7536b6074824cf4
2021-07-26 19:10:01 +00:00
Ahaan Ugale
f71a330975 Merge "Copy ContentCaptureOptions into derived Contexts" into sc-dev am: 2db19f5679 am: 4f6a71d59f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15352571

Change-Id: Ib98760f02b4298e74d85de24298d9e6e00e11147
2021-07-26 19:09:39 +00:00
SongFerng Wang
e9385df2ef Merge "Modify KEY_LTE_ENDC_USING_USER_DATA_FOR_RRC_DETECTION_BOOL's description" into sc-dev am: 75b43af58b am: adf347ef89
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359955

Change-Id: I3430930723371ee23117339a05f5847267973156
2021-07-26 19:09:18 +00:00
TreeHugger Robot
d0b40e1279 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 6791bf04cd -s ours am: 23ff9d219d -s ours am: 11a616e2cd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie090268c2c857bddb1fe1bdff55e1143a8b687fe
2021-07-26 19:09:04 +00:00
TreeHugger Robot
c02458967c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2db4ed1e36 -s ours am: 4ee05ca9db -s ours am: 43f44a433a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie96a83952814ca0bcb2da36523bf40d090230245
2021-07-26 19:08:57 +00:00
Howard Chen
4687f64538 Merge "Fix test harness mode" into sc-dev am: c11f9eca7b am: 6a1e1427eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359967

Change-Id: I6a2c8510214a9bf06338e12480c229f27ee99e59
2021-07-26 19:08:50 +00:00
TreeHugger Robot
01ff950636 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 03fb5e1e37 -s ours am: fdea290e5b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic0e05ab1b26e9c17317abbcbeab9647510cb421b
2021-07-26 19:08:20 +00:00
Benedict Wong
058f263eb2 [automerger skipped] Merge "Shorten safe mode timer in VCN test mode" am: 3923c3acc6 am: 9ddc8bfd13 -s ours am: f4b9f31524 -s ours
am skip reason: Merged-In Ibbf7132d45a7a0e5554b74fda6b3e309ee2d9c44 with SHA-1 dc005a0507 is already in history

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

Change-Id: I354b3ba4dccb5f63e0408597aaad3af873035c3a
2021-07-26 19:08:13 +00:00
Benedict Wong
478ebe91f3 Merge "Shorten safe mode timer in VCN test mode" into sc-dev am: 6ad35a74d8 am: ffb5f1ff10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15375749

Change-Id: I8242251e7fb197153959f25865bfb9c137563e10
2021-07-26 19:07:21 +00:00
TreeHugger Robot
93ab131a66 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6db937667b -s ours am: 783b527615 -s ours am: b5f269011b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I128e12277f3b7c21e023db80dd068d108a330711
2021-07-26 19:07:09 +00:00
Matt Pietal
13e4034e85 [automerger skipped] Merge "[DO NOT MERGE] Update controls icon" into sc-dev am: e81cce70ac am: 49667d62e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2d56f8688dfb81b79471b6c64aaaef26695c52f3
2021-07-26 19:07:01 +00:00
Matt Pietal
f89761084b [automerger skipped] [DO NOT MERGE] Update controls icon am: e8625d279f am: 95cfd1ba8e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I78ed13c1d47c6d1ebbde955ecc01860b46dabd24
2021-07-26 19:07:00 +00:00
TreeHugger Robot
b74cb68b6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4422d05a6a -s ours am: 7a60f81efa -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5160a4e80ed1d14f5cf429d323aff42ad12ca26
2021-07-26 19:06:52 +00:00
Michael Wachenschwanz
b62cb85e65 Merge "Skip flaky AppStandbyTests in presubmit" into sc-dev am: a320be02b1 am: f6298a6337
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15365700

Change-Id: I715a7876d4b915c86cf2c27cf350320c3b43e3ad
2021-07-26 19:06:45 +00:00
TreeHugger Robot
1bc701044c [automerger skipped] Merge changes I635afaaf,Icdd62155 into sc-dev am: 9882c62fb4 am: 0856bdbf41 -s ours
am skip reason: Merged-In I635afaaf9185c32a9f04851453ac7c0d20612c11 with SHA-1 0abf3cdc5f is already in history

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

Change-Id: I25e38d2614327594f94478a6b1516f685b40ce92
2021-07-26 19:06:33 +00:00
Selim Cinek
80de7f4918 [automerger skipped] DO NOT MERGE Fixed the padding of quick settings am: a501b9b9cb am: 716740e3a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic9722f90c00309b0186dd7a328fc405cf8b5ad04
2021-07-26 19:06:32 +00:00
Selim Cinek
cad57853e0 [automerger skipped] Fix drag down animation when bypassing am: 286825f60c am: 01ba6b74a8 -s ours
am skip reason: Merged-In Icdd62155f3762621c1046ed5271476ec0b4e2635 with SHA-1 d879f8802c is already in history

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

Change-Id: I5e93eb6cd05f7d088e542c73ae6f26ffd6e8ccff
2021-07-26 19:06:30 +00:00
Beth Thibodeau
fb5b2534a0 Merge "Reset alpha of media when not fading" into sc-dev am: d3f247befc am: a49c9165d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362254

Change-Id: I656b86eeed181b56e2e8832fe501e7024fb56ae1
2021-07-26 19:06:08 +00:00
Evan Laird
36caec1907 Merge "Remove callback on destroy view" into sc-dev am: 5eed961d53 am: 0e76c5891d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340303

Change-Id: I0b0f652197173e826ba464aabd314fd174800b44
2021-07-26 19:05:57 +00:00
Alison Cichowlas
b4cf9f5ffc Merge "Sharesheet: be more defensive about un-unparcelable intents." into sc-dev am: a1d1a38269 am: ddbade4025
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15374840

Change-Id: I3f542d0d7548543331fd05a704542df7b563a0b0
2021-07-26 19:05:28 +00:00
Suren Baghdasaryan
af89623dbc Merge "ActivityManagerService: report current and max thrashing levels" into sc-dev am: 246926de41 am: 9a1550cac3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15365174

Change-Id: Ibe8f405ee1e6fdf224588ba34b50f2321239e645
2021-07-26 19:03:50 +00:00
Beverly Tai
4ec9aa800d Merge "On devices with udfps, hint to press to open" into sc-dev am: 555c174a66 am: e09ccd0fbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373461

Change-Id: Ic39452e66805ef47436f3a7206b595bc330cb43b
2021-07-26 19:03:30 +00:00
TreeHugger Robot
0c069e04ce [automerger skipped] Merge "[DO NOT MERGE] Controls Lockscreen affordance" into sc-dev am: 53cab1331b am: 09eb0e5723 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib346df1d7938169a405059789ff8179221b720f4
2021-07-26 18:58:55 +00:00
Matt Pietal
0f08fe7c95 [automerger skipped] [DO NOT MERGE] Controls Lockscreen affordance am: 9172eef0cd am: 2fc17ba995 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic305f93dc5877f81dabda19de01c9fca948f93ba
2021-07-26 18:58:53 +00:00
Vishnu Nair
ce5493aa10 Merge "Wallpaper: Propagate transform hint from WM to BBQ surface" into sc-dev am: 2dfdf43732 am: 8ad4528fa2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15372415

Change-Id: Id7391dbc6ce47e2311f062402f74ed4a9c49083a
2021-07-26 18:58:46 +00:00
Santos Cordon
58622a42ef Merge "SCREEN_BRIGHTNESS - map 255 to current max" into sc-dev am: e4e836a175 am: 379e94d1da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359296

Change-Id: I2314b5dd09df823a203088c16481fa8717cae5df
2021-07-26 18:58:37 +00:00
TreeHugger Robot
145243c249 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8bdd0954c -s ours am: a0aef206e6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic16fec8ee9f75af5082fb036758f7358a1969229
2021-07-26 18:58:25 +00:00
TreeHugger Robot
3ca72b6328 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bd70940a6a -s ours am: e3a0f7a5a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I21c7946db3273b7a5915748cd38f442813a98018
2021-07-26 18:58:19 +00:00
TreeHugger Robot
fd69030312 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1cd715f3dd -s ours am: 4dd055469b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb30d626ec2610284114dcaf1d9c8eb86a3772a9
2021-07-26 18:58:11 +00:00
Joe Bolinger
8c8c73e0c9 Merge "Unsubscribe from ALS events when UDFPS does not have an active touch." into sc-dev am: 15a8430fd5 am: 8e193dc64c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15368653

Change-Id: I80fcb5b9ca3aa0829f0fd9060655c57642eba0cc
2021-07-26 18:57:56 +00:00
TreeHugger Robot
894807f557 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9a0c14ce4b -s ours am: 850bb03e30 -s ours am: 821c898fa2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b5ea666bd330c25c07a3d025cbe4549619bc62f
2021-07-26 18:57:48 +00:00
TreeHugger Robot
e73cb924ad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5097313f7a -s ours am: 3fe0512ac5 -s ours am: a3a70fe9dc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I04b73078edaecaa2b641ce92e138a4c8788d6565
2021-07-26 18:57:34 +00:00
TreeHugger Robot
54aebfc002 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a705672152 -s ours am: 66e6b75f9e -s ours am: 47b723cec0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If80d58f2423b511cc6eb4f770e061ab9663dc300
2021-07-26 18:57:27 +00:00
TreeHugger Robot
48bfd737f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3b3d93f167 -s ours am: 1522747734 -s ours am: 748d5f91e5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic3ee0ecc18d3bdf98d64287de06626532e75c45b
2021-07-26 18:57:08 +00:00
TreeHugger Robot
2ce8f90ba5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 01d00fa8a1 -s ours am: c809fe76d6 -s ours am: 0dace5442e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib842ef25d19c62408b0545376b6113b095f578ba
2021-07-26 18:57:01 +00:00
Peter Kalauskas
3282075fd0 Merge "Fix behavior when config_guestUserAutoCreated=true" into sc-dev am: 3d123e4a5e am: 24b9303759
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15350815

Change-Id: I63aa9090f95c92674efbda5328d4349237c845e3
2021-07-26 18:56:55 +00:00
TreeHugger Robot
6a343b5ff6 [automerger skipped] Merge "Revert "Add systrace tag for system property"" into sc-dev am: 95e50fed20 -s ours am: 2ed94835bb -s ours
am skip reason: Merged-In Iaf522b403e51abcf1d49804f35a184b4aa0d3209 with SHA-1 137d78bb67 is already in history

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

Change-Id: Ia98b787c7556becea6f24046b2b909fac5f525db
2021-07-26 18:56:38 +00:00
Hongwei Wang
9879f995c1 Merge "Reset leash and content overlay if auto-enter-pip is aborted" into sc-dev am: d8bc208185 am: 5c7aa45bfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341832

Change-Id: I238e1e125c84a6c372b54c06c5e46c006bce4147
2021-07-26 18:56:22 +00:00