Jing Ji
27e23a3d50
[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours am: 7fe7416e79 -s ours am: a41bf91d53 -s ours am: c22b698208 -s ours am: 1e076760e6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: Ie23179fc1239015cd13c357c8712f63abd7dd21e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 05:08:13 +00:00
Pinyao Ting
891d482fb6
[conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484 am: eee3312ac2 am: 4611aa5717 am: 69042ba58f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668
Change-Id: Ie7ef157b93892ef01774aa6f84580e300c780247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 05:07:46 +00:00
Evan Laird
18917a1820
Merge changes I4977aa47,I87686213,If4bd3e31,I727ad3ca,Ib02a1eb6 into tm-qpr-dev
...
* changes:
[Status bar refactor] Fix cache removal exception
Add a SubscriptionModel
Rename MobileSubscriptionModel to MobileConnectionModel
Better mapping lookup for demo mode
Support new pipeline demo mode in the old view presenter
2022-12-08 04:43:54 +00:00
Jing Ji
e166e03ed3
[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev am: 95907cfca2 -s ours am: d577c51c3d -s ours am: f684abcd18 -s ours am: 64da92499e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: Iff4d9d46893895e81905be7c50b65375c318ee2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 04:37:16 +00:00
Jing Ji
1e076760e6
[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours am: 7fe7416e79 -s ours am: a41bf91d53 -s ours am: c22b698208 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: I4044aa7ce2ac16a5ca65253f77418985d53ade94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 04:36:32 +00:00
Pinyao Ting
69042ba58f
[conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484 am: eee3312ac2 am: 4611aa5717
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668
Change-Id: I9c8cc614d89d1405d922781a5cd7ce6ea12db053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 04:35:40 +00:00
Jing Ji
64da92499e
[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev am: 95907cfca2 -s ours am: d577c51c3d -s ours am: f684abcd18 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: Ida72cde38efe6a30cce8ef364b684fbc8c4b63ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 04:15:24 +00:00
Jing Ji
c22b698208
[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours am: 7fe7416e79 -s ours am: a41bf91d53 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: I2ac91871db7db6dc21d01e42a077b5db735d57de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 04:14:52 +00:00
Pinyao Ting
4611aa5717
[conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484 am: eee3312ac2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668
Change-Id: Ic59fb429f1b0d87d45282515e7a8eea1d022fcf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 04:14:17 +00:00
Jing Ji
f684abcd18
[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev am: 95907cfca2 -s ours am: d577c51c3d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: Ie4ca9b80bd0a681ba9afcc100e58d59925e14394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 03:24:18 +00:00
Jing Ji
a41bf91d53
[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours am: 7fe7416e79 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: I8ffde78a6a167c2b245802b58150f9ccdfe88363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 03:24:01 +00:00
Pinyao Ting
eee3312ac2
[conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668
Change-Id: I161301167ce9d467b47cc709a34ec304696afb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 03:23:38 +00:00
Shaowei Shen
951ceea51c
Merge "[Output Switcher] Update Volume control in Output Switcher" into tm-qpr-dev
2022-12-08 03:23:20 +00:00
Jing Ji
d577c51c3d
[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev am: 95907cfca2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: I56dcd64a304a186ca911db7ad845a6f2c885c910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 02:32:06 +00:00
Jing Ji
7fe7416e79
[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: Iced46759eeb8506364fa78308fb688b18ef8f8aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 02:31:35 +00:00
Chris Li
cc18bee6af
Request change transition for layout direction change for legacy
...
Before, we check if the bounds are resized to start a change transition
to avoid unnecessary screenshot. However, when the layout direction is
changed, we also want to have a change transition when the bounds are
not resized.
Bug: 241043533
Fix: 258130319
Test: atest WmTests:TaskFragmentTest
Change-Id: I413febe18c2288600066e9f8d641d6ab4ec5f126
2022-12-08 10:28:36 +08:00
Pinyao Ting
bb4ff2e484
[conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20642213
Bug: 261780479
Change-Id: I6839241b85cf3775fdc81c1befbd1f263fad7313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 02:12:06 +00:00
TreeHugger Robot
6fa4943481
Merge "[Chipbar] Don't add null icon descriptions to the main description." into tm-qpr-dev
2022-12-08 01:43:50 +00:00
TreeHugger Robot
80821636d9
Merge "[Chipbar] Always tint the start icon correctly." into tm-qpr-dev
2022-12-08 01:43:18 +00:00
Patrick Baumann
051e23fab4
Merge changes from topic "PackageManagerServiceTests-tm-qpr-dev" into tm-qpr-dev
...
* changes:
Cleanup after test suite split.
Moving PackageManagerServiceTests to their own suite.
2022-12-08 01:11:24 +00:00
Jing Ji
95907cfca2
Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev
2022-12-08 01:07:41 +00:00
Chris Li
7ed3a9c3f9
Fix ActivityEmbedding placeholder launching above fullscreen activity
...
Before, we always place the new created TaskFragment on the top of the
Task. Now, when creating TaskFragment for placeholder, we place the new
TasKFragment right above the primary TaskFragment.
In case there is a fullscreen transparent Activity on top of the primary
Activity, this prevents us from launching the placeholder on top of the
transparent Activity.
Bug: 261550242
Test: atest WmTests:TaskFragmentOrganizerControllerTest
Change-Id: I163e9ca1637db45e8695d40a31f2a2c6a4f05189
2022-12-08 08:38:17 +08:00
Evan Rosky
853d0c6f52
Replace direct AR.mVisibleRequested access with getter/setter
...
This abstraction is required for later changes and is also
generally more idiomatic.
the getter for AR is a true getter, so it shouldn't have
a performance impact.
Bug: 260059642
Test: existing tests pass, this is a drop-in refactor
Change-Id: I84bacde8656d98870631d3bd92fa970d72614b93
Merged-In: I84bacde8656d98870631d3bd92fa970d72614b93
(cherry picked from commit 4ff502da98 )
2022-12-08 00:20:31 +00:00
Pinyao Ting
f9a6a136a0
Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20642213
Change-Id: If9820706deb0b9528ecc20a3d513f85692ca8997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 00:14:23 +00:00
Hawkwood Glazier
1c9f506912
[automerger skipped] Merge "MediaPlayer will now transition the background with color scheme" into tm-dev am: 3a2ffd7e0d am: 03b55f7fa7 -s ours
...
am skip reason: Merged-In I963afcf4ba0fd8c2e9ebca4d634098f63454fab6 with SHA-1 90a5f092f1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20552467
Change-Id: I86a439decb07e7e2979fb7728d43bd47c91b4140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 23:50:13 +00:00
TreeHugger Robot
382b7c8be1
Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler" into tm-qpr-dev
2022-12-07 23:37:10 +00:00
Hawkwood Glazier
03b55f7fa7
Merge "MediaPlayer will now transition the background with color scheme" into tm-dev am: 3a2ffd7e0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20552467
Change-Id: Ie30c4f4fce0895c37c49d64390b8301688f4fd99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 23:32:05 +00:00
Mady Mellor
0c1dd96b1f
Fix drawing the ring around adaptive app icons
...
It seems like when you set the bounds on an adaptive icon, it does
not draw the icon in the center of those bounds.
Fix by translating the drawable before setting the bounds.
Also removes drawing black first as this seems to leave a slight
artifact around the edges of the circle otherwise.
Bug: 260636233
Test: manual - mark a bubbleable notification as an important person
- bubble it
=> observe the app icon badge is centered in the
highlight ring
Change-Id: I04279a3c51badd26a5141a8edf77f05472cb9718
2022-12-07 15:30:28 -08:00
Pinyao Ting
584d18790a
Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev
2022-12-07 23:26:20 +00:00
Hawkwood Glazier
3a2ffd7e0d
Merge "MediaPlayer will now transition the background with color scheme" into tm-dev
2022-12-07 23:15:07 +00:00
Pinyao Ting
9507b44655
[automerger skipped] Merge "Implement a global maximum on number of shortcuts an app can publish" into sc-v2-dev am: e51fb72b75 -s ours am: 63d803e611 -s ours am: 62945c47b9 -s ours
...
am skip reason: Merged-In I94b4e39475c7585ec67f15df1256fdf0b65f3bec with SHA-1 fa4b2dc6d8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20643109
Change-Id: I35017de93eed479ac1ff8f9781debb9bfa6baa1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 23:05:41 +00:00
Pinyao Ting
654a4b35a2
[automerger skipped] Implement a global maximum on number of shortcuts an app can publish am: 7622d6da0e -s ours am: 800028ab88 -s ours am: 983196d8ec -s ours
...
am skip reason: Merged-In I94b4e39475c7585ec67f15df1256fdf0b65f3bec with SHA-1 fa4b2dc6d8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20643109
Change-Id: I72cf216c3f6f1cd99552586d92f5d1d05b05d460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 23:05:37 +00:00
Pinyao Ting
62945c47b9
[automerger skipped] Merge "Implement a global maximum on number of shortcuts an app can publish" into sc-v2-dev am: e51fb72b75 -s ours am: 63d803e611 -s ours
...
am skip reason: Merged-In I94b4e39475c7585ec67f15df1256fdf0b65f3bec with SHA-1 fa4b2dc6d8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20643109
Change-Id: I8d6ed162de5e0ce585654d37a9b6ed5625b5bcef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 22:47:50 +00:00
Pinyao Ting
983196d8ec
[automerger skipped] Implement a global maximum on number of shortcuts an app can publish am: 7622d6da0e -s ours am: 800028ab88 -s ours
...
am skip reason: Merged-In I94b4e39475c7585ec67f15df1256fdf0b65f3bec with SHA-1 fa4b2dc6d8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20643109
Change-Id: Ib3d9843100f0a8f79148de940212941397c3054a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 22:47:46 +00:00
Pinyao Ting
69b19f373b
Merge "Implement a global maximum on number of shortcuts an app can publish" into tm-dev am: 118fcda1c0 am: 4fc8a123fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20642864
Change-Id: I9a09b2eedfefaa1913690054d81a16a1c969839a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 22:24:33 +00:00
Pinyao Ting
63d803e611
[automerger skipped] Merge "Implement a global maximum on number of shortcuts an app can publish" into sc-v2-dev am: e51fb72b75 -s ours
...
am skip reason: Merged-In I94b4e39475c7585ec67f15df1256fdf0b65f3bec with SHA-1 fa4b2dc6d8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20643109
Change-Id: I3d573409718cd91d56a05276aa37281144dff58c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 22:21:57 +00:00
Pinyao Ting
800028ab88
[automerger skipped] Implement a global maximum on number of shortcuts an app can publish am: 7622d6da0e -s ours
...
am skip reason: Merged-In I94b4e39475c7585ec67f15df1256fdf0b65f3bec with SHA-1 fa4b2dc6d8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20643109
Change-Id: Id45447edd2eca8d755f1a9b140cb0936dce7969a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 22:21:10 +00:00
Pinyao Ting
ff75f06d8a
Implement a global maximum on number of shortcuts an app can publish
...
Currently there is a limit on the number of shortcuts an app can publish
in respect to each launcher activity. This CL further implements a
global maximum of total number of shortcuts an app can publish to
mitigate from any potential system health issue.
Bug: 250576066
Test: manual
Change-Id: I94b4e39475c7585ec67f15df1256fdf0b65f3bec
Merged-In: I94b4e39475c7585ec67f15df1256fdf0b65f3bec
2022-12-07 22:09:08 +00:00
Pinyao Ting
e51fb72b75
Merge "Implement a global maximum on number of shortcuts an app can publish" into sc-v2-dev
2022-12-07 22:08:54 +00:00
Kenneth Ford
fb54cadffc
Adds content descriptions for rear display animation
...
Bug: 257345938
Test: Manual with talkback
Change-Id: I4a8c7d73d8e058656a937084913bcb5839f9d987
2022-12-07 22:06:43 +00:00
William Leshner
8573c6a4fd
Merge "Add DOCK_SETUP_PROMPTED enum value to Settings." into tm-qpr-dev
2022-12-07 22:01:24 +00:00
Pinyao Ting
4fc8a123fd
Merge "Implement a global maximum on number of shortcuts an app can publish" into tm-dev am: 118fcda1c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20642864
Change-Id: Ib1f898161cc6d7fb03ad17fb6c531c683aa0f6f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 21:59:21 +00:00
Alex Buynytskyy
0cadcd1648
Cleanup after test suite split.
...
Bug: 238141698
Bug: 261478099
Test: presubmit
Change-Id: I3d99829a735bc09b52ef77d75d875ca547d53f01
Merged-In: I3d99829a735bc09b52ef77d75d875ca547d53f01
2022-12-07 21:52:46 +00:00
Alex Buynytskyy
b8859a2055
Moving PackageManagerServiceTests to their own suite.
...
Bug: 238141698
Fixes: 238141698
Bug: 261478099
Test: atest PackageManagerServiceServerTests FrameworksServicesTests
Change-Id: Iacc89c7525d8d9beec39c242bfc305ad08844580
Merged-In: Iacc89c7525d8d9beec39c242bfc305ad08844580
2022-12-07 21:52:06 +00:00
Pinyao Ting
7622d6da0e
Implement a global maximum on number of shortcuts an app can publish
...
Currently there is a limit on the number of shortcuts an app can publish
in respect to each launcher activity. This CL further implements a
global maximum of total number of shortcuts an app can publish to
mitigate from any potential system health issue.
Bug: 250576066
Test: manual
Change-Id: I94b4e39475c7585ec67f15df1256fdf0b65f3bec
Merged-In: I94b4e39475c7585ec67f15df1256fdf0b65f3bec
2022-12-07 21:36:56 +00:00
Pinyao Ting
118fcda1c0
Merge "Implement a global maximum on number of shortcuts an app can publish" into tm-dev
2022-12-07 21:36:18 +00:00
Prameet Shah
a9d6896c83
Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler
...
Bug: 242344103
Bug: 261526316
Test: m
Change-Id: I37fa9c7bb99d1ea1cef1bd42125bf0de7bc0adbd
(cherry picked from commit cb6ec60b034d6265cea391a3966ffdc9c72248d5)
2022-12-07 21:36:08 +00:00
TreeHugger Robot
76f824b2f9
Merge "AudioService: do not log sound effects in audio dumpsys" into tm-qpr-dev
2022-12-07 21:34:54 +00:00
Beverly Tai
98ad6693da
Merge "Start a new keyguard session on device sleep" into tm-qpr-dev
2022-12-07 21:23:17 +00:00
Aaron Liu
c17a684c9d
Merge "[Bouncer] Do not Autosize numpad." into tm-qpr-dev
2022-12-07 21:03:28 +00:00