f03dc2aed5
[automerger skipped] Fix launch flow when one app in an app pair is paused am: d2f256f179 -s ours
...
am skip reason: Merged-In Ieaf0120cced07b6ac0f3eb07c75b66666a8dcc85 with SHA-1 17db14b107https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26927941
Change-Id: Ib768f256eeecc92ae03898584b0562514f4f63bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-11 23:56:16 +00:00
db967cbb16
Update to correct Material SurfaceContainer values am: 588a4abf4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26860034
Change-Id: Ic979ae7698953e7c550b378fd827bcdda06e5c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-11 23:56:14 +00:00
381266e1f4
[automerger skipped] Update app pair icon colors when switching containers am: f49807538b -s ours
...
am skip reason: Merged-In I615cb95d51f7c4c120ad306246d9491bf4452229 with SHA-1 05617cb11fhttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26928603
Change-Id: I453f226c7b3411673a631378bc17780e9edfd41a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-11 23:56:11 +00:00
130be57171
Merge "Set camera icon as gray when app is unlaunchable" into main
2024-04-11 21:41:21 +00:00
3983ad0350
[automerger skipped] Merge "Allow app pairs in folders" into 24D1-dev am: 559aeb2c45 -s ours
...
am skip reason: Merged-In I73732fcaefbdc61bf6e02a5be365962b8bbc3e41 with SHA-1 a596f589c4https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26907722
Change-Id: Iddd6c4d87cae874ddcc0450c3448334fbe12e323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-11 21:11:38 +00:00
af6aa2c034
[automerger skipped] Allow app pairs in folders am: 9109e43f02 -s ours
...
am skip reason: Merged-In I73732fcaefbdc61bf6e02a5be365962b8bbc3e41 with SHA-1 a596f589c4https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26907722
Change-Id: I7ca6356bad0272fc4f18c8c48a19f8ccfcab21f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-11 21:11:35 +00:00
d2f256f179
Fix launch flow when one app in an app pair is paused
...
This CL changes the error handling logic in ItemClickHandler to continue with app pair launch when only one app in an app pair is paused. It also changes AppPairIconGraphic so that the disabled state of the app pair is drawn modularly (if only one app is paused, only one app will appear visually paused).
Bug: 330795643
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: Ieaf0120cced07b6ac0f3eb07c75b66666a8dcc85
(cherry picked from commit 17db14b107
2024-04-11 21:09:56 +00:00
588a4abf4a
Update to correct Material SurfaceContainer values
...
This CL fixes a bug where all surface_container color values (highest, high, surfaceContainer, low, lowest) were set to the same color value (the surfaceContainer value). Reference values taken from Android color token library at https://www.figma.com/file/o26ZXcRCR6gv0mEdl7Ix53/%5BAndroid-U%5D-Fog?type=design&node-id=4441-6849&mode=design&t=hXj4we7EkD8GWsD0-0
Bug: 315731527
Flag: none
Test: none
Change-Id: Ib6fa7739e6d644ea9a6e5cb388678a51926c7b71
(cherry picked from commit b35769003e
2024-04-11 21:06:27 +00:00
f49807538b
Update app pair icon colors when switching containers
...
This CL updates the color for the app pair background, and adds a way for an app pair icon to redraw as a different color when switching containers.
Bug: 315731527
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: I615cb95d51f7c4c120ad306246d9491bf4452229
(cherry picked from commit 05617cb11f
2024-04-11 20:59:05 +00:00
559aeb2c45
Merge "Allow app pairs in folders" into 24D1-dev
2024-04-11 20:55:33 +00:00
61d51f3c2b
[automerger skipped] Merge "Removes recovery" into 24D1-dev am: 98e57de7a8 -s ours
...
am skip reason: Merged-In Icbebeade552cb101eb4b8bae4965b4d6c972f22e with SHA-1 6ce297a2ffhttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26657960
Change-Id: Ic742333dc8a69daec465c5e1ae37e0390e3edeca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-11 20:11:08 +00:00
f5c78364e6
[automerger skipped] Removes recovery am: c43b7163a2 -s ours
...
am skip reason: Merged-In Icbebeade552cb101eb4b8bae4965b4d6c972f22e with SHA-1 6ce297a2ffhttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26657960
Change-Id: Ib170642df4277ac6c5fa3f02bcd4d2dbb078a488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-11 20:11:04 +00:00
98e57de7a8
Merge "Removes recovery" into 24D1-dev
2024-04-11 19:37:47 +00:00
5bb103246b
Merge "Adjust where the back button is rendered for new SUW requirements." into main
2024-04-11 19:05:52 +00:00
c77a9ae116
Merge changes from topic "revert-26911513-revert-26414135-RecentsViewContainer-MEROZZOKJQ-WQFWDQZVKT" into main
...
* changes:
Revert^2 "fixing tests to match new abstraction"
Revert "Revert "abtracting Activity from recentsView through rec..."
2024-04-11 18:05:18 +00:00
d84b369960
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: f3313ac56a -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26914549
Change-Id: I782bb0ced3288eece93b4b46e32effb9c4f417e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-11 17:43:09 +00:00
9361e8d8b9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b02a2a31f8 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26914549
Change-Id: I20e658a01e4749e1f04ae9f22d6d93c5eaeeb5c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-11 17:43:04 +00:00
2b1e5cb8f3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 2da34d8529 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26914547
Change-Id: Ic4d790cde4448d56c89cd6149833ae97b7d02ad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-11 17:43:02 +00:00
9d1c3a3457
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6acf5c87c -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26914547
Change-Id: If85f17b414ffd09341ad897e7813cf8200b2b6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-11 17:43:00 +00:00
7d56237bce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 04d38ce5d2 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26907728
Change-Id: Id652f80367bf2ef383bc006d680ee3d3ef5e9a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-11 17:42:56 +00:00
73b2ca4af6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffdd0fe4cd -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26907728
Change-Id: Ib8c535a2b743badbb591f74b9f401c777c656a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-11 17:42:45 +00:00
f3313ac56a
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-04-11 17:26:52 +00:00
2da34d8529
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-04-11 17:26:52 +00:00
04d38ce5d2
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-04-11 17:26:52 +00:00
58a34cbb1d
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-04-11 17:25:57 +00:00
bebdb53d72
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-04-11 17:25:57 +00:00
eaaf350e2d
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-04-11 17:25:57 +00:00
da26e19dd8
Adjust where the back button is rendered for new SUW requirements.
...
Large screen devices in landscape mode and devices that have mostly a
square aspect ratio are undergoing a redesign in Setup wizard that makes
most screens two-pane. As part of this redesign, the back button is
aligned in this change. This change doesn't use a flag because the Setup
Wizard change is not flagged.
Fixes: 323778778
Fixes: 328017929
Test: Run Setup Wizard and see if the back button aligns with the Skip
button in two pane screens.
Flag: N/A
Change-Id: I22680f40c0ddf7cd03ab1da69406eb14184b0174
2024-04-11 16:53:41 +00:00
c21b0000b5
Revert^2 "fixing tests to match new abstraction"
...
8e4c0b7afb
2024-04-11 08:58:22 -07:00
819b835519
Revert "Revert "abtracting Activity from recentsView through rec..."
...
Revert submission 26911513-revert-26414135-RecentsViewContainer-MEROZZOKJQ
Reason for revert: Fix for issue has been found and will be included in this revert.
Reverted changes: /q/submissionid:26911513-revert-26414135-RecentsViewContainer-MEROZZOKJQ
Change-Id: I517e7d2fc0d82d250a6ed40862dd31c194d0a302
2024-04-11 08:58:08 -07:00
a5e838d61c
Set camera icon as gray when app is unlaunchable
...
This CL is a follow-up to ag/26825455. Now that we are changing app pairs' disabled appearance back to icon-only, the case where a camera icon should be grayed out on an app pair on a small screen needs to be reinstated.
Fixes: 333137187
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: I64ae3db28293fa0adc249d700e9e03c074b6854f
2024-04-11 11:25:27 -04:00
2a51fc6420
Merge "Fix issue that widgets with config activity jump" into main
2024-04-11 14:08:54 +00:00
926a10a3b0
Create a stubbed IRemoteTransition implementation.
...
Bug: 323863002
Flag: NA
Test: NA, new method is unused (still builds)
Change-Id: Ibc4187f469e41b2db91bef368c710ffbdcd33faf
2024-04-11 09:15:41 +00:00
174e2224b6
Merge "Update predictive back progress interpolator" into main
2024-04-11 08:06:50 +00:00
20c0b2f647
Merge "Add placeholder divider view when starting split tasks" into main
2024-04-11 05:10:35 +00:00
cdaabc6199
Add placeholder divider view when starting split tasks
...
* This prevents launcher underneath from peaking through
while the split apps are loading
Bug: 299640096
Test: Launched from recents, home and all apps
Doesn't seem to affect small screen since recents scrolls
away and the scrim is only left
Change-Id: I32e394a0bc361489473ee657161c8f3bcbf1e422
2024-04-11 05:09:49 +00:00
f5299f3168
Merge "Move AbstractFloatingView for stage split layering above all apps" into main
2024-04-11 05:05:01 +00:00
1bd514df83
[automerger skipped] Reparent folders and app pairs am: 00bf2488d1 -s ours
...
am skip reason: Merged-In Ia8c429cf6e6a376f2554ae1866549ef0bcab2a22 with SHA-1 742630c2f8https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26906947
Change-Id: I01289e9c26c1599cab5ac6ecb6bba2d5bb55e9b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-11 04:07:30 +00:00
9109e43f02
Allow app pairs in folders
...
This CL substantially refactors folders to be able to take contents of type AppPairInfo. App pairs can now be moved in and out of folders, and launch from folders.
This CL contains only logic and model changes; animation and style changes (for dropping items into folders, color changes to app pair surfaces, etc.) will be in a following CL. Another CL (hopefully) will contain tests. I'm planning to submit them together, but this patch should also be able to stand alone with no issues (except janky transitions).
Bug: 315731527
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual, more to follow in another CL.
Change-Id: I73732fcaefbdc61bf6e02a5be365962b8bbc3e41
(cherry picked from commit a596f589c4
2024-04-11 03:51:53 +00:00
3158bf7e43
Move AbstractFloatingView for stage split layering above all apps
...
- We don't need to worry about if it's in Overview. Only overview has task menus, so if there is no task menu, we place it at the top.
Fixes: 332465429
Test: Launch stage split using keyboard shortcuts with all apps open. Make sure it's above all apps.
Change-Id: Ic950d2897fe80ef407038dd840b86fc92d6d6287
2024-04-10 19:42:50 -07:00
b02a2a31f8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3e262ed2c5bac0ad34a2aeb1412e600e1b4b9f11
2024-04-10 18:55:12 -07:00
251c0be069
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iae22ab09ff18456b772d3da8efa3dbd3b2189600
2024-04-10 18:54:44 -07:00
d6acf5c87c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id26f1c61bd070906f0ddeaa1fc553fa578105d92
2024-04-10 18:54:16 -07:00
af3617f8c6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0c203d9dd8437e31cea4a1d3392c5ea004b3f768
2024-04-10 18:53:55 -07:00
ffdd0fe4cd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4d11fa2ea72763bfbd9875daca8e82f65e08a4a0
2024-04-10 18:53:31 -07:00
0d81a8f979
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic74edaf2283e8de9bd37ccef7e266c0c5e68dcdd
2024-04-10 18:53:04 -07:00
1d6851083b
Merge changes from topic "revert-26414135-RecentsViewContainer-MEROZZOKJQ" into main
...
* changes:
Revert "abtracting Activity from recentsView through recentsview..."
Revert "fixing tests to match new abstraction"
2024-04-10 23:58:09 +00:00
63bf93cf65
Merge "Freezing legacy feature flags" into main
2024-04-10 22:29:24 +00:00
3c71346147
Revert "abtracting Activity from recentsView through recentsview..."
...
Revert submission 26414135-RecentsViewContainer
Reason for revert: Probable culprit for b/333767026. Will be verifying through ABTD for confirmation and before submitting the revert.
Reverted changes: /q/submissionid:26414135-RecentsViewContainer
Change-Id: I25775cd6531355f1dc042ddb7a8d442ee0b36e58
2024-04-10 21:31:07 +00:00
8e4c0b7afb
Revert "fixing tests to match new abstraction"
...
Revert submission 26414135-RecentsViewContainer
Reason for revert: Probable culprit for b/333767026. Will be verifying through ABTD for confirmation and before submitting the revert.
Reverted changes: /q/submissionid:26414135-RecentsViewContainer
Change-Id: Ibafc66cf3677d24e7912d55cb45c948cb6519df7
2024-04-10 21:31:14 +00:00
Jeremy Sim
Vinit Nayak
Andreas Agvard
Saumya Prakash
Randy Pfohl
Treehugger Robot
Bill Yi
Shamali Patwa
Luca Zuccarini
Danny Burakov
Tracy Zhou
Priyanka Advani
Sunny Goyal