Automerger Merge Worker
5d12fe84c7
Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master
...
* changes:
[automerger skipped] Merge "Merge Android 13 QPR1" am: e3c1707e36 -s ours
[automerger skipped] Merge Android 13 QPR1 am: 96a7524c32 -s ours
2022-12-09 23:29:43 +00:00
Xin Li
7b0e393ca5
[automerger skipped] Merge "Merge Android 13 QPR1" am: e3c1707e36 -s ours
...
am skip reason: Merged-In I61ad93cf5e8d8e25cf856c807027769f209c371a with SHA-1 43e258e0ce is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2337138
Change-Id: I4989d113238758f0f32098d108f52245147d4ea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 23:21:28 +00:00
TreeHugger Robot
08e1f9f7c4
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-09 23:20:31 +00:00
TreeHugger Robot
53cfbf1584
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-09 23:20:31 +00:00
Xin Li
a966eeb139
[automerger skipped] Merge Android 13 QPR1 am: 96a7524c32 -s ours
...
am skip reason: Merged-In I61ad93cf5e8d8e25cf856c807027769f209c371a with SHA-1 43e258e0ce is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2337138
Change-Id: Ic3ad52f4ab2b7b7f74853176a82445ed77ea56fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 23:19:10 +00:00
Xin Li
d5e958ec46
[automerger skipped] Merge "Merge Android 13 QPR1" am: e3c1707e36 -s ours
...
am skip reason: Merged-In I61ad93cf5e8d8e25cf856c807027769f209c371a with SHA-1 43e258e0ce is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2337138
Change-Id: I11566ec925cb24f8d4340655a99f6f60c408e473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 23:16:46 +00:00
Xin Li
c62829632f
[automerger skipped] Merge Android 13 QPR1 am: 96a7524c32 -s ours
...
am skip reason: Merged-In I61ad93cf5e8d8e25cf856c807027769f209c371a with SHA-1 43e258e0ce is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2337138
Change-Id: Ia180b2932e5fe28c766eacb713709348a2f4f36b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 23:14:26 +00:00
Sihua Ma
60813a89f7
Changed widget picker personal-work tab layout
...
Used layout margin instead of padding. Also making sure that Talkback would focus on the widgets title once the widget picker is opened.
Before: https://screenshot.googleplex.com/AgZspqTc7yS2Lte
Now: https://screenshot.googleplex.com/5W66ky7XAByCFRZ
Fix: 247121867
Test: Manual
Change-Id: I76534454754c5e57ab51ae7ce06ca4370a3fd22b
2022-12-09 13:58:57 -08:00
Xin Li
e3c1707e36
Merge "Merge Android 13 QPR1"
2022-12-09 21:50:58 +00:00
Brian Isganitis
85ccf120f2
Better support transient and persistent taskbar in taskbar's overlays.
...
- Transient taskbar nav threshold now works in overlays.
- Delay closing overlay to transient app-window threshold if necessary.
- Persistent taskbar no longer stashes for EDU overlay.
- EDU overlay provides enough bottom padding for transient and
persistent taskbar.
Test: Manual
Bug: 217261955
Change-Id: I2ae5612ef70a6d09e22f83f8117cdbf2a0a053b8
Fix: 260769010
2022-12-09 11:24:27 -08:00
Xin Li
96a7524c32
Merge Android 13 QPR1
...
Bug: 261731544
Merged-In: I61ad93cf5e8d8e25cf856c807027769f209c371a
Change-Id: Iae118f5f502be298c25568ab08b9696eee22f61f
2022-12-09 10:30:16 -08:00
Sunny Goyal
5daac6fbfb
Merge "Removing some unnecessary interfaces and merging them to ActivityContext" into tm-qpr-dev am: d31c8baef1 am: deffe8f8df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20676568
Change-Id: I97e64fbb701249aef7268421943f0e174a59c3bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 16:14:28 +00:00
Sunny Goyal
deffe8f8df
Merge "Removing some unnecessary interfaces and merging them to ActivityContext" into tm-qpr-dev am: d31c8baef1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20676568
Change-Id: Ie215c1933dce65d87204e5969c470548452a7998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 15:47:35 +00:00
Sunny Goyal
d31c8baef1
Merge "Removing some unnecessary interfaces and merging them to ActivityContext" into tm-qpr-dev
2022-12-09 15:35:59 +00:00
Fengjiang Li
a6a67e347d
Support mouse right click on HomeScreen to show the customization menu
...
Bug: b/250089861
Fix: b/250089861
Test: Manual Testing
Video: https://b.corp.google.com/action/issues/250089861/attachments/40243664?download=true
Change-Id: Ia23e302bf8f3e18fafd6ccd079740c8005ae7860
2022-12-09 02:44:09 +00:00
Ats Jenk
5c3e394aec
Merge "Check for both proto flags for common logic" into tm-qpr-dev am: e8c57e94e7 am: 7868989e50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20653403
Change-Id: I4a6caf4fc8ac4df2b19e3c636b5b5ade948f339a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 00:57:59 +00:00
Ats Jenk
7868989e50
Merge "Check for both proto flags for common logic" into tm-qpr-dev am: e8c57e94e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20653403
Change-Id: I155bba8ce3621fcb235d3b5cc245e381f3c22947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 00:54:23 +00:00
Ats Jenk
e8c57e94e7
Merge "Check for both proto flags for common logic" into tm-qpr-dev
2022-12-09 00:43:04 +00:00
Brian Isganitis
9a7d443a28
Merge "Add EDU lottie animations for persistent and transient." into tm-qpr-dev am: ddc7ef2eb1 am: 2b5ba5eb5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20672612
Change-Id: I517c94e189d7e4a2e8a2d0fb7b4cb835b66911df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 00:27:18 +00:00
Brian Isganitis
2b5ba5eb5f
Merge "Add EDU lottie animations for persistent and transient." into tm-qpr-dev am: ddc7ef2eb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20672612
Change-Id: Ie302f00d1ba369210caf9910422a1df305a8a4ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 00:02:31 +00:00
Becky Qiu
6b52305b28
[Toast] Add a new attribute for rich answer type.
...
Bug: 261205664
Test: local
Change-Id: I2ff89c02c72d0a8ef3572b51f9429ab199231c3f
2022-12-08 15:41:37 -08:00
Brian Isganitis
ddc7ef2eb1
Merge "Add EDU lottie animations for persistent and transient." into tm-qpr-dev
2022-12-08 23:11:27 +00:00
Federico Baron
3f82a06c7f
Remove delightful page indicator
...
Due to design changes, we are no longer going to use the changes guarded under the flag SHOW_DELIIGHTFUL_PAGINATION, so we remove the flag and the code that was guarded by that flag
Bug: 261904707
Test: verify flag SHOW_DELIGHTFUL_PAGINATION no longer exists and that the regular pagination works without issues after removing all this code
Change-Id: I244b88b98df0357aa99a325a11988e8248a03206
2022-12-08 15:00:02 -08:00
Holly Sun
66a7fdcd90
Set the default value for SCROLL_TOP_TO_RESET to true.
...
Per UX, we can enable this feature by default.
Bug: 218846025
Test: manual
Change-Id: I828515ec45e84007cee3893cd2b76fca7c5afee2
2022-12-08 14:13:07 -08:00
Federico Baron
47d81686e6
Move AnimatedFloat from quickstep to launcher
...
We are moving AnimatedFloat to launcher to be able to use this in class in launcher. Having it in launcher will allow us to do restore icon treatment animations to do with scaling the icon size
Bug: 254858049
Test: verified that the device still works
Change-Id: I1c4c47ab436c389a94abf7c910c1a44724efc955
2022-12-08 13:58:07 -08:00
Jeremy Sim
2cbd7bbfdf
Use already-running app instances when splitting
...
This patch makes it so that when the user initiates a split from Home, a running app instance is used instead of always attempting to spawn a new Intent. If no matching app instance is found, behavior is unchanged.
Previously, splitting from Home always resulted in a new Intent being staged, which ignored the fact that an app of the same type could already be running. This resulted in undesirable situations like being able to attempt splitting an app with itself in Overview.
Fixed by querying the RecentsModel when a split of this type is initiated, checking to see if there is a running task of the desired type, and using that to perform the split operation if one is found. When Overview is loaded, applyLoadPlan() will now check to see if there is a staged task, and remove the associated tile as needed. If the removed task is part of a pair, this involves creating a temporary TaskView to hold the other task.
Also fixes a bug where using the Taskbar to select one's second app would incorrectly choose the oldest instance of a multi-instance app rather than the newest.
Fixes: 257513447
Fixes: 259936298
Test: Manual
Change-Id: I97a62f34c03aa4980f9cd743e35e9fc6ef4c092d
2022-12-08 13:24:43 -08:00
Stefan Andonian
969606e2ba
Fix for bug where expensive launcher animations were being paused and never resumed. am: 677978c8ab am: 47035c7165 am: 61c23f1efb am: 73c2b40724
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20582304
Change-Id: I615c035173372acb74568a16856e2fd8fc254567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 21:08:54 +00:00
Stefan Andonian
73c2b40724
Fix for bug where expensive launcher animations were being paused and never resumed. am: 677978c8ab am: 47035c7165 am: 61c23f1efb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20582304
Change-Id: If6c1f018b439205cf914e5036f4b743f7bdd5d98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 20:46:12 +00:00
Stefan Andonian
61c23f1efb
Fix for bug where expensive launcher animations were being paused and never resumed. am: 677978c8ab am: 47035c7165
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20582304
Change-Id: I5dd9b5e9457d2becb7da668bcb779e3f0092a80d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 20:19:07 +00:00
Stefan Andonian
629a915eee
Fix for bug where expensive launcher animations were being paused and never resumed. am: 677978c8ab am: 078bb9338c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20582304
Change-Id: I7d290353e06e588491d7a13a1597793a2a7bc5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 20:18:28 +00:00
Stefan Andonian
47035c7165
Fix for bug where expensive launcher animations were being paused and never resumed. am: 677978c8ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20582304
Change-Id: Ie20521302dc0bd37621dfe471906ab349b6db074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 19:32:31 +00:00
Stefan Andonian
078bb9338c
Fix for bug where expensive launcher animations were being paused and never resumed. am: 677978c8ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20582304
Change-Id: Ice492ce44086ab2fe0e21631b067e489ced310ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 19:32:14 +00:00
Sunny Goyal
7243523b3e
Merge "Adding support for generating manachrome icon from a colored icon" into tm-qpr-dev am: 9898d7906e am: 4cdb55e5a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20647520
Change-Id: I05d6bbba6751d86de041593da23d07f3fc402e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 19:29:48 +00:00
Sunny Goyal
4cdb55e5a7
Merge "Adding support for generating manachrome icon from a colored icon" into tm-qpr-dev am: 9898d7906e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20647520
Change-Id: I575f4cda0e7ad07a0a9b968bb667c260c333804b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 19:05:27 +00:00
Sunny Goyal
9898d7906e
Merge "Adding support for generating manachrome icon from a colored icon" into tm-qpr-dev
2022-12-08 18:54:59 +00:00
Brian Isganitis
b962950ae9
Add logging to investigate updateOverviewTargets state.
...
Test: Manual (logcat)
Bug: 258022658
Change-Id: I50640124f1e8fd5ae4aaf6240c044ded108849b5
2022-12-08 18:26:22 +00:00
Sunny Goyal
54fa110bba
Removing some unnecessary interfaces and merging them to ActivityContext
...
Bug: 259733681
Test: Everything compiles
Change-Id: If6b530f6e589a851cf8554f5de0849843bd66dd4
2022-12-08 10:15:55 -08:00
Schneider Victor-tulias
80b25c756a
[DO NOT MERGE] Log gesture velocity to help debug and help direct future gesture nav thresholds.
...
Bug: 259021562
Test: performed gestures and checked logs
Change-Id: If0dec4ef74c2ef2d1617d8c37f10f3ef9d96b2f5
2022-12-08 17:42:53 +00:00
Schneider Victor-tulias
eb4a5c7cbd
Log gesture velocity to help debug and help direct future gesture nav thresholds.
...
Bug: 259021562
Test: performed gestures and checked logs
Change-Id: If0dec4ef74c2ef2d1617d8c37f10f3ef9d96b2f5
2022-12-08 17:40:09 +00:00
Tony Wickham
a008f510c5
Merge "Add IS_RUNNING_IN_TEST_HARNESS check for isTransientTaskbar" into tm-qpr-dev am: 788f8e09fe am: 6ecdbc69b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20666524
Change-Id: I18305f4cf6874a418845b719996955e861fb005b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 17:01:33 +00:00
Jon Miranda
7234034cee
Enable transient taskbar flag on by default.
...
Bug: 261859222
Test: manual
Change-Id: I46ed930aba743f76da3b6fe94629fdb0f585ee55
2022-12-08 16:45:10 +00:00
Tony Wickham
6ecdbc69b2
Merge "Add IS_RUNNING_IN_TEST_HARNESS check for isTransientTaskbar" into tm-qpr-dev am: 788f8e09fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20666524
Change-Id: Id1c71be116afa8bb77bb2213064939ea34f86d1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 16:39:43 +00:00
Tony Wickham
788f8e09fe
Merge "Add IS_RUNNING_IN_TEST_HARNESS check for isTransientTaskbar" into tm-qpr-dev
2022-12-08 16:21:43 +00:00
Tony Wickham
5de5ac9008
Add IS_RUNNING_IN_TEST_HARNESS check for isTransientTaskbar
...
This avoids us trying to read FORCE_PERSISTENT_TASKBAR feature flag
which apparently crashes tests due to permission issues. Going forward,
when we support persistent taskbar better, we should update the tests
and this check as commented in the code.
Test: com.google.android.apps.nexuslauncher.TaplTestsNexus#testSearchNoInputs
Fixes: 261604544
Change-Id: I35c20825e8171766834f0f32be4f3818d02ab1df
2022-12-08 16:19:16 +00:00
Schneider Victor-tulias
673d6a01ed
Merge "Revert "Cancel gestures on launcher destroy"" into tm-qpr-dev am: ad48decd4f am: d132ad4393
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20664263
Change-Id: I13f6d462dc8fabc0010661aea379bcf2357f9a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 15:47:36 +00:00
Schneider Victor-tulias
d132ad4393
Merge "Revert "Cancel gestures on launcher destroy"" into tm-qpr-dev am: ad48decd4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20664263
Change-Id: Icfdd29ce44e4ff73bfb79b3150addca41b7517cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 15:25:37 +00:00
Schneider Victor-tulias
ad48decd4f
Merge "Revert "Cancel gestures on launcher destroy"" into tm-qpr-dev
2022-12-08 14:55:15 +00:00
Brian Isganitis
77de0d5a28
Add EDU lottie animations for persistent and transient.
...
This CL introduces separate lottie assets for light and dark themes, as
well as each step. Each asset contains all of the steps currently but is
constrained to a min and max frame. In future CLs, we will optimize the
storage these take up by using the global assets and controlling min and
max frames programmatically, or trimming each individual asset.
Additionally, we should only be importing one theme variant and then
converting to the opposite programmatically, but the color mappings are
not ready yet.
Future polish to the EDU sheet, such as better handling the stashed
taskbar, will be introduced in future CLs.
Test: Manual in transient and persistent modes.
Bug: 217261955
Change-Id: I5b219ea02e25de0c5c887b5b5640f909e1219287
2022-12-08 14:06:09 +00:00
Bill Yi
5b235359bb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifabaa6394d850ae49d470c20029d29f42ee1cc87
2022-12-08 02:37:29 -08:00
Bill Yi
1fae94761a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibdfae18cb652adb0be0e17e4346d31fd44f79137
2022-12-08 02:36:55 -08:00