Matt Pietal
f37b7bf3fa
Merge "[DO NOT MERGE] Bouncer - Update selected item text color" into tm-dev
2022-05-03 14:46:23 +00:00
Vadim Caen
064b49a1a1
Merge "Add developer option for back animation DO NOT MERGE" into tm-dev
2022-05-03 14:13:57 +00:00
Vadim Caen
4f77430976
Merge "Update deprecation documentation for onBackPressed" into tm-dev
2022-05-03 14:13:35 +00:00
Chris Li
d4011e0e2b
Merge "Don't launch placeholder for bottom TaskFragment when waiting for top" into tm-dev
2022-05-03 14:12:54 +00:00
Eric Laurent
11e5671297
Merge "audio: fix accessibility routing in call" into tm-dev
2022-05-03 14:08:33 +00:00
Shaowei Shen
8292f122d8
Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Behavior improvement" into tm-dev
2022-05-03 13:49:43 +00:00
Shaowei Shen
abe29d7362
Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected" into tm-dev
2022-05-03 13:49:25 +00:00
Beverly Tai
d9803be1a9
Merge "DO NOT MERGE Update active unlock triggers take #2 " into tm-dev
2022-05-03 13:47:36 +00:00
Chris Li
597b031cc5
Merge "Make sure empty TaskFragment notify organizer" into tm-dev
2022-05-03 13:33:54 +00:00
Matt Pietal
195baa1c93
[DO NOT MERGE] Bouncer - Update selected item text color
...
Constrast was too low, didn't match specs. Also noticed that if the
user updated the dark mode while on lockscreen, the colors for both
the user switcher and the num pad keys were not properly updating.
Fixes: 221368641
Test: manual
Change-Id: I5b9b2dca8f8246d403bcf919b8f2a2ba4ea2d9ec
2022-05-03 12:29:48 +00:00
Wesley Wang
1d1d37ca68
Merge "Disable battery saver notification based on predicted time left" into tm-dev
2022-05-03 12:27:37 +00:00
Vadim Caen
29347308d7
Update deprecation documentation for onBackPressed
...
Add some detail about migrating to OnBackInvokedDispatcher and the
reason behing the deprecation of onBackPressed methods.
Fixes: 227563202
Test: Documentation change only
Change-Id: Ifc2dd88cb9600efae84cd353549811e7b07ae4bc
2022-05-03 13:51:15 +02:00
Justin Weir
b41c2879b4
Merge "Ensure log buffers are dumped to file on uncaught exceptions" into tm-dev
2022-05-03 11:38:59 +00:00
Nikita Ioffe
239f082d75
Merge "apk-in-apex-cache 1/n: Fix isCacheUpToDate for apk-in-apex" into tm-dev
2022-05-03 09:32:41 +00:00
Jim Blackler
70853212e7
Merge "Loading boost: use the existing GAME_LOADING power mode, and deactivate it on a timer." into tm-dev
2022-05-03 08:48:42 +00:00
Chris Li
c45e1c1ed5
Don't launch placeholder for bottom TaskFragment when waiting for top
...
1. When the top TaskFragment just appears, we should treat it as active
even if it is empty, because we are expecting an activity to be
launched into it soon. Before that happens, we don't want to launch
placeholder for the activity behind.
2. When a TaskFragment is appeared as empty, set a timeout to remove it
instead of waiting forever in case the activtiy start failed.
Fix: 230540531
Bug: 219683160
Test: atest WMJetpackUnitTests:SplitControllerTest
Test: atest WMJetpackUnitTests:TaskFragmentContainerTest
Change-Id: Ie05e379bf898b67912a849ad84f9fe7708e289c6
2022-05-03 15:24:33 +08:00
Philip Quinn
ec77a90abc
Merge "Revert "Un-obscure the Telephony phone account ID."" into tm-dev
2022-05-03 07:14:08 +00:00
Jernej Virag
cfbbd755ff
Merge "Trace Window relayout reasons" into tm-dev
2022-05-03 06:45:30 +00:00
Riddle Hsu
89e92e9bd0
Merge "Toggle orientation sensor outside of WM lock" into tm-dev
2022-05-03 06:37:44 +00:00
Charles Chen
9040b7e261
Merge "Update SplitContainer for non-finishing containers" into tm-dev
2022-05-03 06:37:26 +00:00
Philip Quinn
e536aa4f9e
Merge "Revert "added call notif exemption to PostNotificationRunnable"" into tm-dev
2022-05-03 06:36:02 +00:00
Chris Li
9ebaba818d
Make sure empty TaskFragment notify organizer
...
Before, we only notify organizer for empty TaskFragment when either the
Task is empty or the last activity in the TaskFragment is reparented to
PIP task.
However, there can also be cases where the last activity in a
TaskFragment is finished in background. We also want to give it a chance
to remove the TaskFragment.
Bug: 225371112
Test: atest WmTests:TaskFragmentOrganizerControllerTest
Change-Id: Id679524a48a0693f15334f98058aaaf4caac52d2
2022-05-03 05:57:22 +00:00
shaoweishen
73706ceebf
DO NOT MERGE: Downbranch merge conflict [Output Switcher] Behavior improvement
...
Use Lock when access MediaDevices in MediaOutputController as in
LocalMediaController, prevent devices changed while refreshing.
Sort devices in Controller to make sure the sequence is correct.
Add grouping state to make dynamic grouping has transition state.
Bug: 228511134
Bug: 228255441
Test: N/A
Change-Id: I4976176f3133e48c41a56d746861a9a4027f9a34
2022-05-03 04:53:36 +00:00
shaoweishen
de900861e9
DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected
...
Bug: 203074066
Test: Verified on device
Change-Id: Ib40bb575796d077d7fcf89d510087e4fcb0bc00b
2022-05-03 04:41:30 +00:00
TreeHugger Robot
a683c1ba94
Merge "Deprecate and remove ProcessStateRecord.mAllowStartFgsState field." into tm-dev
2022-05-03 04:00:56 +00:00
TreeHugger Robot
a776c95416
Merge "ColorSchemeTransition now updates the ripple color" into tm-dev
2022-05-03 03:46:07 +00:00
TreeHugger Robot
ae7d1beb80
Merge "Ensure GameSession is not destroyed when restarting game." into tm-dev
2022-05-03 03:28:30 +00:00
Lucas Dupin
ae0a72f3c7
Merge "Avoid Spell Checker initialization during anim" into tm-dev
2022-05-03 03:10:10 +00:00
TreeHugger Robot
2ca31b10ab
Merge "Add some extra exception catching/logging to readxml" into tm-dev
2022-05-03 02:50:17 +00:00
Rhed Jao
a22156f40d
Merge "Fix incorrect PackageSetting in the SharedUserSetting" into tm-dev
2022-05-03 02:45:20 +00:00
TreeHugger Robot
1c51fb46b1
Merge "Fix ManualBenchmarkState iteration unit" into tm-dev
2022-05-03 01:57:07 +00:00
TreeHugger Robot
6725f73a88
Merge "Notify organizer about TaskFragment parent windowing mode change" into tm-dev
2022-05-03 01:32:14 +00:00
Philip Quinn
4d31508c32
Revert "added call notif exemption to PostNotificationRunnable"
...
This reverts commit 7a2eb5704b .
Reason for revert: b/231247057
Change-Id: I7245a2a8b892fa1615555ba5512297e25c1c0252
2022-05-03 00:41:24 +00:00
Victor Berchet
c410410d1c
[automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours am: aeecad4897 -s ours am: bcf1533d30 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: I0351da37a4897a693335f9ab6a2878ce370c7b93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:32:29 +00:00
Victor Berchet
91ee254850
[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 56f74b2e6e -s ours am: abc0fd6965 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: Ib990fb87512c297f11a5bf4f04e8b6e5a82ad633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:32:01 +00:00
Victor Berchet
c7e7366bca
[automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours am: 46897fa1e5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: I4bed9042556e3a58d379d03b2e443d0d2235f992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:01:20 +00:00
Victor Berchet
bcf1533d30
[automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours am: aeecad4897 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: I43415d5d125e59e0085ff5b8638970eff7e717c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:01:01 +00:00
Victor Berchet
abc0fd6965
[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 56f74b2e6e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: Id1c455a1c9f5109318455e8f8ed0868e5d9bf6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:00:58 +00:00
Victor Berchet
6728cfa75f
[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 62a0230994 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: I3b3569ac2adb2896b57ae1943b2a0b8ff1f0266e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:00:55 +00:00
Lucas Dupin
4a092d43c4
Avoid Spell Checker initialization during anim
...
TextView initializes the spell checker when the view is attached to a
window, making a couple of IPCs.
These IPCs can contribute to jank, so we should avoid them if we can.
This CL delays the initialization until the edit text actually becomes
visible.
Test: perfetto trace
Test: atest RemoteInputViewTest
Fixes: 191953960
Change-Id: I27820986ec925f5edbf7e26f6b8f7311f6d2f467
2022-05-02 16:52:49 -07:00
Victor Berchet
aeecad4897
[automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: Ia6d052abd376f352d59fd77d7210f68a2a7e8555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:29:33 +00:00
Victor Berchet
56f74b2e6e
[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: I5b2dc3b08f41fcc64196de6e94d1d921da0cb8dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:29:32 +00:00
Victor Berchet
46897fa1e5
[automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: I59118f2c52abc27a75a25ab9e0306cac396a7606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:28:43 +00:00
Victor Berchet
62a0230994
[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: I8b8c1d10e686d41b4d35fdd5024dea9dc57c425a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:28:39 +00:00
Philip Quinn
8f0afb889c
Revert "Un-obscure the Telephony phone account ID."
...
This reverts commit f601004255 .
Reason for revert: b/231244396
Change-Id: Ibc922d80fd85c7a8060d9a8ec667345643dce614
2022-05-02 23:17:59 +00:00
Victor Berchet
4fea97557a
[automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: I4f8299748dd8971d7b0b4ec978ed64493c21f510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:02:06 +00:00
Victor Berchet
ae0479380a
[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: I9e265bf6eac9c52fe31f63425fc06147cd3b64ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:01:49 +00:00
Victor Berchet
83b4fadcb7
[automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: I31a2312fc7520654a27fe3736c55650746c744d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:37:19 +00:00
Victor Berchet
3020cc3897
[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: I08f7f5a2b91a7c1a096913f4a083c46e997543e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:37:13 +00:00
Nikita Ioffe
d6359a85af
Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" into tm-dev
2022-05-02 22:25:07 +00:00