Commit Graph

817004 Commits

Author SHA1 Message Date
Bill Yi
da5b6afa09 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0b760186fee197d384850edce575c6db35c6bfd7
2022-07-14 01:40:55 -07:00
Yunfan Chen
746cce200a Merge "Reland "Make extra navigation bar count towards non decor frame""" into tm-qpr-dev am: 367ff5a1d8 am: 2d3df2917e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18425968

Change-Id: I950132a5367eb06f54f6be29cb58d101c8532d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 03:41:05 +00:00
Yunfan Chen
2d3df2917e Merge "Reland "Make extra navigation bar count towards non decor frame""" into tm-qpr-dev am: 367ff5a1d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18425968

Change-Id: I1db57d7f006915126eabbe8afb01f8fb5c2ffa0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 03:23:05 +00:00
Sean McQuillan
5c7ba918d4 Merge changes I212bb5b7,I35a2a76d
* changes:
  Mark nullability for TextView.setText(char[])
  Don't crash after unsetting char[] in TextView
2022-07-14 03:15:03 +00:00
Yunfan Chen
367ff5a1d8 Merge "Reland "Make extra navigation bar count towards non decor frame""" into tm-qpr-dev 2022-07-14 03:01:36 +00:00
Louis Chang
3e41b7d005 Merge "Revert "Send RESULT_CANCELED immediately if start-activity-for-result across TaskFragments"" into tm-qpr-dev am: 6446b23045 am: 355877448e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272610

Change-Id: I677efef841ea99f33bfd6f18952d7498eacd07ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 02:52:17 +00:00
Louis Chang
355877448e Merge "Revert "Send RESULT_CANCELED immediately if start-activity-for-result across TaskFragments"" into tm-qpr-dev am: 6446b23045
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272610

Change-Id: I13b1ef9d5dd48ed589239d69a2d5839e81e55736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 02:15:20 +00:00
Louis Chang
6446b23045 Merge "Revert "Send RESULT_CANCELED immediately if start-activity-for-result across TaskFragments"" into tm-qpr-dev 2022-07-14 01:59:10 +00:00
Louis Chang
f0fd60b012 Merge "Do not append NEW_TASK flag when caller activity is finishing" 2022-07-14 01:58:37 +00:00
Steve Elliott
8e4230d67e [automerger skipped] Fix stale NSSL "fling" state caused by no-op fling am: 7f387f9ae9 am: 9166048414 -s ours am: 42df6531c6 -s ours
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

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

Change-Id: I4b5b8ed8c9048a342c9382fa81692e9e1a74dbba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 01:22:55 +00:00
Steve Elliott
eeee484cdc [automerger skipped] Fix stale NSSL "fling" state caused by no-op fling am: 7f387f9ae9 -s ours am: ad1cf3ab29 -s ours am: 5e5268c808 -s ours
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 369571a493 is already in history

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

Change-Id: Ibde63e47b8dec5810dd58979a87eaa821569cb5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 01:22:32 +00:00
Chandru S
4d4ba1a785 Merge "Remove dead code from KeyguardUpdateMonitor" into tm-qpr-dev am: 20a0bce466 am: bee1d1f963
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19192718

Change-Id: Ie464bffd27f18b0a34c82f61f5adbc8a1d0dba19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 01:21:36 +00:00
Steve Elliott
42df6531c6 [automerger skipped] Fix stale NSSL "fling" state caused by no-op fling am: 7f387f9ae9 am: 9166048414 -s ours
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

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

Change-Id: Ia01213545459c9b2231c43a7dba75009d1f88cf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:53:02 +00:00
Steve Elliott
5e5268c808 [automerger skipped] Fix stale NSSL "fling" state caused by no-op fling am: 7f387f9ae9 -s ours am: ad1cf3ab29 -s ours
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 369571a493 is already in history

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

Change-Id: I04f10e7eef990dd67ec524749e9b2742120908e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:46:24 +00:00
Chandru S
bee1d1f963 Merge "Remove dead code from KeyguardUpdateMonitor" into tm-qpr-dev am: 20a0bce466
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19192718

Change-Id: Ic66e572a5227bab6b84cb90c9e2b9a932121dc2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:45:52 +00:00
Steve Elliott
9166048414 Fix stale NSSL "fling" state caused by no-op fling am: 7f387f9ae9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19279469

Change-Id: I1b2c18f237c9ea380f25e6abe90c920af417b12b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:39:19 +00:00
Steve Elliott
ad1cf3ab29 [automerger skipped] Fix stale NSSL "fling" state caused by no-op fling am: 7f387f9ae9 -s ours
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 369571a493 is already in history

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

Change-Id: Ide4e28d300e52ec1be3bf1da396ac18feaf7a02f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:39:07 +00:00
Chandru S
20a0bce466 Merge "Remove dead code from KeyguardUpdateMonitor" into tm-qpr-dev 2022-07-14 00:26:27 +00:00
Bill Lin
9c8e10d085 Merge "Update biometrics tests OWNERS" into tm-qpr-dev am: c2593ac8c6 am: 92d286924e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19265986

Change-Id: I0dff8d32f48f555ef9e83454f229986254f2485b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:17:24 +00:00
TreeHugger Robot
0320cfa48a [automerger skipped] Merge "Add ViewController for KeyguardBottomAreaView." into tm-qpr-dev am: 5086c853e1 am: 338f54bb0d -s ours
am skip reason: Merged-In I3945214b2670ddd6a9f48736407ebdb89203c017 with SHA-1 199b699c1e is already in history

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

Change-Id: I3792960400703f781153c09ff3bfb7c3db29e4f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:16:46 +00:00
Dave Mankoff
ddc368fe4f [automerger skipped] Merge "Remove SystemUIFactory#shouldInitializeComponents" into tm-qpr-dev am: 6abc4e067d am: 8a43e29bcc -s ours
am skip reason: Merged-In I56537764f0f6ea3519211a9403da2bef7c49bc7e with SHA-1 a1989bcb85 is already in history

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

Change-Id: I0c4b44a4a913e55b3ffa2d870bded3dc23d53c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:15:56 +00:00
Bill Lin
92d286924e Merge "Update biometrics tests OWNERS" into tm-qpr-dev am: c2593ac8c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19265986

Change-Id: I73629e40caf6bd3415c3a00c290db29525a9b548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:14:28 +00:00
TreeHugger Robot
17d7e9f5c8 Merge changes Ib10fa8e9,Iaad14420 into tm-qpr-dev am: 7169bb42d7 am: 440f58b4d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19110379

Change-Id: Ib641b0d4c31008c1d7e7964e268188a7837e2336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:14:07 +00:00
TreeHugger Robot
338f54bb0d Merge "Add ViewController for KeyguardBottomAreaView." into tm-qpr-dev am: 5086c853e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19279468

Change-Id: I252be0b62edc4f6c9a8fdabc56f74e8be7ca344c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:13:03 +00:00
Dave Mankoff
8a43e29bcc Merge "Remove SystemUIFactory#shouldInitializeComponents" into tm-qpr-dev am: 6abc4e067d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19279481

Change-Id: I1eecf5830714b69bc39a38331941a9300a461a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:11:16 +00:00
TreeHugger Robot
440f58b4d3 Merge changes Ib10fa8e9,Iaad14420 into tm-qpr-dev am: 7169bb42d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19110379

Change-Id: I1c97880b9e7cffc976a2b45fdf3c22a23ec96ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:07:08 +00:00
Treehugger Robot
3fcd05c7db Merge "Fix weak global reference overflow" am: d1a6cd9185 am: 199deef1be am: acb7f6d887 am: af3fc0c14a am: 141db07589
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2150993

Change-Id: Ib29d977b6a35218315e183e74f6927aa888bbd6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:05:06 +00:00
Bill Lin
c2593ac8c6 Merge "Update biometrics tests OWNERS" into tm-qpr-dev 2022-07-13 23:52:55 +00:00
Treehugger Robot
141db07589 Merge "Fix weak global reference overflow" am: d1a6cd9185 am: 199deef1be am: acb7f6d887 am: af3fc0c14a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2150993

Change-Id: Iacc96eb653b2d4d3da54c0937c0e766884f06184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 23:45:34 +00:00
TreeHugger Robot
5086c853e1 Merge "Add ViewController for KeyguardBottomAreaView." into tm-qpr-dev 2022-07-13 23:44:49 +00:00
Dave Mankoff
6abc4e067d Merge "Remove SystemUIFactory#shouldInitializeComponents" into tm-qpr-dev 2022-07-13 23:44:38 +00:00
TreeHugger Robot
7169bb42d7 Merge changes Ib10fa8e9,Iaad14420 into tm-qpr-dev
* changes:
  Inline notif pipeline flag into SBNActivityStarter
  Inline notif pipeline flag into CentralSurfaces
2022-07-13 23:40:14 +00:00
Treehugger Robot
af3fc0c14a Merge "Fix weak global reference overflow" am: d1a6cd9185 am: 199deef1be am: acb7f6d887
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2150993

Change-Id: Ie622d7506b537e419da21b40247a4274b83b3708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 23:20:07 +00:00
TreeHugger Robot
e35b0a5001 Merge "Try to fix stale mDisplaySize" into tm-qpr-dev am: 6b55fa7144 am: 900910e2af
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19276947

Change-Id: I1b2aefe98c82202e512dd5aa22660e55f7f777a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 23:05:00 +00:00
Guojing Yuan
33f8bb1388 [automerger skipped] Merge "Fix feature flag check for FEATURE_COMPANION_DEVICE_SETUP" into tm-qpr-dev am: a63b02aa16 am: 0845453dcc -s ours
am skip reason: Merged-In I556089e2b024eaf87937e57e8825ae0e7c61e02c with SHA-1 fd755df5c4 is already in history

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

Change-Id: Ib6afbd75ec3dcdb6e57c653cc13f89772498188c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 23:04:29 +00:00
Treehugger Robot
acb7f6d887 Merge "Fix weak global reference overflow" am: d1a6cd9185 am: 199deef1be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2150993

Change-Id: I4db6a50a9ac92b097442d995c6df26017d808996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 23:03:37 +00:00
TreeHugger Robot
900910e2af Merge "Try to fix stale mDisplaySize" into tm-qpr-dev am: 6b55fa7144
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19276947

Change-Id: I90c4cdee602044ff5ee8bf22a35b8fb3119f3274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 22:46:26 +00:00
Guojing Yuan
0845453dcc Merge "Fix feature flag check for FEATURE_COMPANION_DEVICE_SETUP" into tm-qpr-dev am: a63b02aa16
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19242639

Change-Id: I9a3bc758850e9320006c6605d7b9ec9c61899982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 22:45:44 +00:00
Treehugger Robot
199deef1be Merge "Fix weak global reference overflow" am: d1a6cd9185
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2150993

Change-Id: I4687ab8f7f5bc2955975b717cf354c77ad5eb6de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 22:45:43 +00:00
TreeHugger Robot
6b55fa7144 Merge "Try to fix stale mDisplaySize" into tm-qpr-dev 2022-07-13 22:36:34 +00:00
Guojing Yuan
a63b02aa16 Merge "Fix feature flag check for FEATURE_COMPANION_DEVICE_SETUP" into tm-qpr-dev 2022-07-13 22:29:24 +00:00
Treehugger Robot
d1a6cd9185 Merge "Fix weak global reference overflow" 2022-07-13 22:25:36 +00:00
Rajeev Kumar
b80346fbf7 Merge "Add PM checker for AppOpsManager" 2022-07-13 22:23:05 +00:00
Nikita Dubrovsky
2d3ffe0826 Merge "Deprecate and no-op test API getContentCaptureServicePackageName" 2022-07-13 21:59:32 +00:00
Jeff DeCew
c768a8340f Fix squished notifications on the lockscreen. am: 52ebab8ffd am: 4c931226b5 am: ea6adee415
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19279480

Change-Id: Iaac0e65fb04a18d529cc0bd125fe37a00b89601c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 21:57:26 +00:00
Jeff DeCew
f99be81215 Fix squished notifications on the lockscreen. am: 52ebab8ffd am: a0a8dc0db0 am: db935797fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19279480

Change-Id: Ic7f823b68615aec13a7bd38c0722418fc3ddabaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 21:56:44 +00:00
Selim Cinek
59c52361e8 Merge "Turn off Back affordance flag" into tm-qpr-dev am: 435bae4155 am: 52d8557c59
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19262527

Change-Id: I034401781e7d98252772bf2f8a0bcbeb5c51ec84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 21:56:07 +00:00
Evan Rosky
ed7c93e384 Merge "Calculate the correct surface layers for finishTransaction" into tm-qpr-dev am: 43c0cbec0a am: 8e14b1fb22
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19261966

Change-Id: I23fcb915792d27087dc9e4d471630bf373fc0859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 21:54:35 +00:00
Jeff DeCew
ea6adee415 Fix squished notifications on the lockscreen. am: 52ebab8ffd am: 4c931226b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19279480

Change-Id: Ic03b0131f73d962231e5309c5977b272a099afbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 21:53:02 +00:00
Jeff DeCew
db935797fa Fix squished notifications on the lockscreen. am: 52ebab8ffd am: a0a8dc0db0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19279480

Change-Id: Ia036b7b53f5839d9f0f4060c5fff7860e43ce8c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 21:36:12 +00:00