Commit Graph

898574 Commits

Author SHA1 Message Date
Hongwei Wang
df26c36bf9 Merge "Fix NPE in PipTaskOrganizer#setPipVisible" into udc-dev am: 29668d515f am: bf5d00ce72
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23665533

Change-Id: Ie24a9f1d0fe3fb468fd1d212dbdee27590848d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 15:03:44 +00:00
Winson Chung
9f7f358d6f Merge "Fix NPE from accessing pausing tasks" into udc-dev am: 996ae43573 am: 5828f82eda
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667199

Change-Id: I03d174f16840cb2e4d2ae4cb2038e54fc03c5bea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 15:03:30 +00:00
Sudheer Shanka
db76ec4d77 Merge "Retry manifest bcast delivery if the receiver dies as part of unfreezing." into udc-dev am: 0bd2ce4eb7 am: 6266231995
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23500523

Change-Id: Ic6ed3e31c60678762a70a4e3fe774508e265f3b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 15:03:14 +00:00
Mady Mellor
dc87ea3734 Merge "Don't merge task view transitions in UnfoldTransitionHandler" into udc-dev am: 021e9f1a71 am: 75337fa06d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23666087

Change-Id: I576dd8da2e05c25102c461b50eed3e0170e2355f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 15:02:58 +00:00
Naomi Musgrave
2b67c0f43b Merge "Revert "[getPossibleMaximumWindowMetrics] return bounds in natural orientation"" into udc-qpr-dev 2023-06-16 14:55:40 +00:00
Hawkwood Glazier
f114d7ee35 Merge "Remove deprecated clock components" into udc-qpr-dev 2023-06-16 14:02:05 +00:00
Cosmin Băieș
cec9bf548b Merge "Fix IME nav bar button flickers" into udc-qpr-dev 2023-06-16 13:49:12 +00:00
Cosmin Băieș
8c033eb698 Merge "Cleanup IME window visibility flag logic" into udc-qpr-dev 2023-06-16 13:42:20 +00:00
Fabian Kozynski
21648e7780 Merge "Prevent NPE on race condition" into udc-qpr-dev 2023-06-16 13:19:59 +00:00
Miranda Kephart
8b7d200a60 Merge "Add shared transitions from clipboard UI" into udc-qpr-dev 2023-06-16 13:15:54 +00:00
Massimo Carli
671bd95e03 Merge "[3/n] Improve LetterboxConfiguration readability" into udc-qpr-dev 2023-06-16 13:12:49 +00:00
Chandru S
eacf34bc18 Show specific messages for why bouncer is shown before or after OTA update.
Test: 1. Restart the device,
      2. Run `adb setprop sys.boot.reason.last reboot,mainline_update` before unlock
      3. See message on bouncer
Test: atest KeyguardViewMediatorTest
Bug: 285956229
Bug: 285578578
Change-Id: I8623cce9e9eb4c321f377f262e9831e3c3a62e93
2023-06-16 02:20:15 +00:00
Joshua Mccloskey
9a60d6d679 Merge "Finish FaceAuthClient onLockout" into udc-qpr-dev 2023-06-15 21:46:50 +00:00
Automerger Merge Worker
3425013ec3 Merge changes from topic "am-eda0d966ad2c44ed98fdb85d1555b595" into udc-dev am: 4bf08f4c26 am: b2757069c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667949

Change-Id: I263120ac687dfd27a0f9352d4d01d889d3621c85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:50:32 +00:00
Treehugger Robot
500abbb027 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 6190c9b061 -s ours am: a290fb9dee -s ours am: a1659046fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I92c70f5220f9b685046d6ed6b589d2826f526722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:50:17 +00:00
Treehugger Robot
db631e71b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c99cee6e60 -s ours am: 2d752c5a0a -s ours am: 7e44c8dfe2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb5ac8bdc045a3baee6a9e6ceb85cac4995647c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:49:54 +00:00
Bill Yi
c6638984f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9dbd2c4a1c -s ours am: 4ea4b754c3 -s ours am: 341edf9f56 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e6cbc4af85bfb72f19ebc1d0a83e9a685e79a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:49:45 +00:00
Automerger Merge Worker
b5c13b6d23 Merge changes from topic "am-f41ce26583ca44729c5d6c2e1dcadaae" into udc-dev am: 8e65786778 am: b190a1984e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667249

Change-Id: I0ba6071cb850afd4a47ea30d4b4d78a0033af387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:49:23 +00:00
Treehugger Robot
b358920dd9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 02768bcf3b -s ours am: 9dd47f01d4 -s ours am: cec3647ebc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a8930a104a0402d87f6a046aa617532575cf9cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:49:20 +00:00
TreeHugger Robot
c168df1ff1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5b885d049b -s ours am: ca23dbf7cb -s ours am: f3cdb00a57 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I769e783059e1dd9ac7eb008e750108cf78186123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:48:50 +00:00
Bill Yi
cfbd646cbd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d8c95887b -s ours am: e8465de1c4 -s ours am: a5208f000f -s ours
am skip reason: subject contains skip directive

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

Change-Id: If5903b3d1fd56a39094be2af9d014e8fe141e47d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:48:46 +00:00
Automerger Merge Worker
341d143fdd Merge changes from topic "am-ca006b49c781433a98b70cd175d5cbd7" into udc-dev am: 3ea6b91cd3 am: c31ef7d271
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23667434

Change-Id: Ic6e8ad09c035842ed91e10ab96fcdcb8d2ac4881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:48:20 +00:00
Treehugger Robot
6b95526929 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b9c02a920b -s ours am: 7b0656ed02 -s ours am: 0e26cd9b52 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I71684012463e31f22b0d03a28df0309264403459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:48:18 +00:00
Automerger Merge Worker
9971741df9 Merge changes from topic "am-73bb4c2bdb294c428b32f2fd74a86ef4" into udc-dev am: fae2b9f865 am: f0082b46e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23665937

Change-Id: I445dbd7fd73145087e0271925e46ef4dc10fc70a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:47:46 +00:00
TreeHugger Robot
fd4c948db4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 94df684f61 -s ours am: 00d587d03f -s ours am: b2eb3cedeb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icbc69cc7a742d29e3bf811b5812c2ab0248872a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:47:37 +00:00
Riddle Hsu
699b2094e4 Reset factory of TaskPositioner in test am: 823bf01687 am: 02fdef0599 am: 83796d78c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23666668

Change-Id: I537e1b35f153e11e13bdcd67baf219c32da0b616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:45:58 +00:00
Wenhui Yang
f5454e3766 Merge "Display display "Fingerprint not recognized" on BP" into udc-qpr-dev 2023-06-15 17:26:03 +00:00
Jeff DeCew
793ecc1938 Merge "Revert "Add redundant tint to notification and footer button backgrounds."" into udc-qpr-dev 2023-06-15 16:59:25 +00:00
Fabián Kozynski
d88e74870d Prevent NPE on race condition
There could be a race condition where there is a dispatch to mCallback
after it's been nulled, due to the dispatch happening not on the same
thread. Check if the callback has been nulled.

Fixes: 287421329
Test: build
Change-Id: Idaa0c106ff034ea55b08bf4230565aa3cae6f6a8
2023-06-15 12:31:48 -04:00
Bryce Lee
fcb72565f3 Merge "Update DreamManagerService to be aware of user switching." into udc-qpr-dev 2023-06-15 15:39:50 +00:00
Joshua McCloskey
1aba0e6eec Finish FaceAuthClient onLockout
Test: atest FaceAuthenticationClientTest
Bug: 250071647
Change-Id: Icb845b11e592fd548679f27fd6ca567590578eb6
(cherry picked from commit 9f26c90ffb)
2023-06-15 15:10:20 +00:00
Naomi Musgrave
9508671214 Revert "[getPossibleMaximumWindowMetrics] return bounds in natural orientation"
This reverts commit 490f4937b0.

Reason for revert: b/287306886 failing launcher test

Change-Id: I06ef09af28f507eeb33e4836c1ea0bd806a36be9
2023-06-15 14:31:53 +00:00
Jeff DeCew
88e9a196f2 Revert "Add redundant tint to notification and footer button backgrounds."
This reverts commit 881635995c.

Reason for revert: Underlying issue has been resolved.
Fixes: 282173943
Change-Id: Ibc785e26bf1fca4b7612de06f11cd7b6aff0430f
2023-06-15 13:45:50 +00:00
Caitlin Shkuratov
6f4622fdb7 Merge "[Central Surfaces] Remove unused CentralSurfaces from NSSLC." into udc-qpr-dev 2023-06-15 13:14:11 +00:00
Miranda Kephart
e98c450cb8 Add shared transitions from clipboard UI
Flag: CLIPBOARD_SHARED_TRANSITIONS

Bug: 277948029
Test: manual
Change-Id: Ic9828ef5577038698772a8c24c08ec5c94ae6eec
2023-06-15 13:14:05 +00:00
Caitlin Shkuratov
72f8eb6077 Merge "[Central Surfaces] Move shelf click wakes to PowerInteractor." into udc-qpr-dev 2023-06-15 13:07:15 +00:00
Oleg Petšjonkin
6ab34e28cf Merge "No sensors support in DDC rework" into udc-qpr-dev 2023-06-15 12:48:26 +00:00
Caitlin Shkuratov
2429cb017e Merge "[Central Surfaces][Disable] Remove old from the disable logger." into udc-qpr-dev 2023-06-15 12:31:31 +00:00
TreeHugger Robot
ceceefa515 Merge "wm: fix APPEARANCE_LOW_PROFILE_BARS not working in non-fullscreen app" into udc-qpr-dev 2023-06-15 12:23:38 +00:00
TreeHugger Robot
67dd5a0c64 Merge "Only delay wake-up animation if AOD is enabled" into udc-qpr-dev 2023-06-15 11:53:40 +00:00
Massimo Carli
8dd1f858ef [3/n] Improve LetterboxConfiguration readability
Improve readability of isCameraCompatTreatmentEnabled() and
isDisplayRotationImmersiveAppCompatPolicyEnabled() in case
we need to access their build time values.

Fix: 287210791
Test: atest WmTests:DisplayRotationCompatPolicyTests
      atest WmTests:DisplayRotationImmersiveAppCompatPolicyTests
      atest WmTests:LetterboxUiControllerTest

Change-Id: I0ae4494025e1a4ba46ef91c8d4f1920b03caf333
2023-06-15 11:52:27 +00:00
Justin Weir
3c39be1f84 Merge "Extract back handling from CentralSurfaces" into udc-qpr-dev 2023-06-15 11:23:34 +00:00
Ivan Tkachenko
4927ffbe5b Merge "Share bubbles dismiss functionality with Launcher" into udc-qpr-dev 2023-06-15 10:29:36 +00:00
Chaohui Wang
8779fae8c9 Merge "Remove primaryUserOnly param from AppListPage" into udc-qpr-dev 2023-06-15 09:29:37 +00:00
Massimo Carli
cffafd6d32 [2/n] Migrate to SynchedDeviceConfig
Fixes: 270357347
Test: Run `atest WmTests:LetterboxConfigurationTest`

Change-Id: I657d352bf2c614aff05cb71524d3ab1ce927da23
2023-06-15 08:06:25 +00:00
Rhed Jao
5a07569093 Merge "Add a verification flow for the user to exit repair mode" into udc-qpr-dev 2023-06-15 04:55:42 +00:00
Chaohui Wang
23dbbd27ee Merge "New onViewCreated in AbstractPreferenceController" into udc-qpr-dev 2023-06-15 03:00:51 +00:00
Hao Dong
751a307954 Merge "Add onUdfpsUiEvent() and callbacks on overlay shown in FingerprintManager." into udc-qpr-dev 2023-06-15 01:22:21 +00:00
Chandru S
74ba9601a3 Add new strings that are shown when the user is asked to enter pin/pattern/password instead of biometrics
Test: NA, string change
Bug: 285956229
Bug: 285578578
Change-Id: I934699aac3714079b9aa67f54f2ae4105f5c7300
(cherry picked from commit 8a6b5edaf6)
Merged-In: I934699aac3714079b9aa67f54f2ae4105f5c7300
2023-06-14 22:54:52 +00:00
Chandru S
591ac68614 Merge "Show custom message when user has specifically locked down the device." into udc-qpr-dev 2023-06-14 22:21:14 +00:00