Commit Graph

74570 Commits

Author SHA1 Message Date
Sebastian Franco f5a2e75100 In the case the gird migration goes to a taller grid keep the grid configuration
For example going from 4x5 to 4x6 it will keep the 4x5 configuration
which fits in the 4x6 grid.

Also, it fixes GridMigrationTest which was flaky because of
how it sorted arrays.

Bug: 325286145
Flag: ACONFIG grid_migration_fix disabled
Test: NA
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2eaf15c37a051fd17c18c4443a8bd19d39057bf0)
Merged-In: I6063e3c303320096f7429a3b1d909e107d2ef2a0
Change-Id: I6063e3c303320096f7429a3b1d909e107d2ef2a0
2024-04-22 16:15:13 +00:00
Sebastián Franco 87fbc2e02e Revert^4 "Removing all restored backups except one so we don't have old backups"
To prevent the error I introduce the method restorePreviousState().

This reverts commit 1234090589.

Reason for revert: Fixing presubmit breaks

Bug: 325285743
Flag:  ACONFIG narrow_grid_restore disabled
Test: BackupAndRestoreDBSelectionTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ad46eb75f4c239321b1e8f03062dd7599cdc9495)
Merged-In: I63666c29eb91dada4243af019ab0538c40bc0f78
Change-Id: I63666c29eb91dada4243af019ab0538c40bc0f78
2024-04-19 18:27:07 +00:00
Sebastian Franco 6aa4389285 Add testing for GridMigration.
Bug: 325286145
Flag: ACONFIG grid_migration_fix disabled
Test: GridMigrationTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:851b1f3b1c103b28d6df6653693ee132c92086e7)
Merged-In: I49fd32be895f3a05204775373b9eec62d9026f3b
Change-Id: I49fd32be895f3a05204775373b9eec62d9026f3b
2024-04-18 01:17:24 +00:00
Sebastian Franco 0312ec60a3 Refactor migrateGridIfNeeded to pass the grid states and make it easier for unit testing
No-op change

Bug: 325286145
Flag: NA
Test: compiling
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c3ffd41ff0f150ea91ad2a324dd4613b7d0cd89f)
Merged-In: I703c08059b81e20111c17a142dc54335f18a5a87
Change-Id: I703c08059b81e20111c17a142dc54335f18a5a87
2024-04-18 01:17:18 +00:00
fbaron 6fba6cdb85 Make hotseat column span responsive
Flag: NONE
Test: DeviceProfileDumpTest, DeviceProfileAlternativeDumpTest, HomeScreenImageTest
Bug: 325084912
Change-Id: Ifa9e8066662a1ab053f66b8800b739d813d2dab8
(cherry picked from commit e4b0b71faa)
2024-04-17 17:56:58 +00:00
Lynn Yeh 4a01d58d9a Merge "Update KQS task view layouts to new specs" into 24D1-dev 2024-04-17 08:20:55 +00:00
Treehugger Robot 6df62bb61b Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-16 17:25:06 +00:00
Treehugger Robot d04756e030 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-16 17:25:06 +00:00
Bill Yi d1e3e34210 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2bd5a497b90f72434eb614983c97a9098f7be31e
2024-04-15 19:09:43 -07:00
Bill Yi d6c9f1d828 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5fba395e14bbc3449b54fcec9142a8a2b01daada
2024-04-15 19:08:44 -07:00
Saumya Prakash ca987a3dff Merge "Fix incorrect fragment in gesture tutorial when rotating the screen" into 24D1-dev 2024-04-15 21:22:26 +00:00
Shamali Patwa 3e239309f1 Merge "Fix issue that old search results list show up momentarily" into 24D1-dev 2024-04-15 20:06:32 +00:00
Jagrut Desai 40d013086e Merge "Folder Title Change Listener" into 24D1-dev 2024-04-15 16:41:27 +00:00
Lynn Yeh f99f04608b Merge "Close the KQS view when touching the gesture nav region" into 24D1-dev 2024-04-15 14:36:52 +00:00
David Lin cb37425710 Merge "Do not report finish in mergeAnimation..." into 24D1-dev 2024-04-15 10:08:18 +00:00
Jagrut Desai 4fe59a2ce8 Folder Title Change Listener
Bug: 305877212
Test: Manual
Flag: NONE
Change-Id: I10c7e0827a05010720daeb9da7a0be854ee06112
(cherry picked from commit 06a05c3806)
2024-04-12 16:54:56 +00:00
Federico Baron d7022dc0ac Merge "Page resets when scrolling slowly fix" into 24D1-dev 2024-04-12 04:53:49 +00:00
Treehugger Robot 028e1fcd9d Merge "Launch AppPair live tile when not visible" into 24D1-dev 2024-04-12 03:59:27 +00:00
Treehugger Robot 8119d72903 Merge "Add placeholder divider view when starting split tasks" into 24D1-dev 2024-04-12 03:48:46 +00:00
Vinit Nayak 95a7ca485e Launch AppPair live tile when not visible
* End the recents animation and then relaunch as if
from scratch
* We explicitly ignore the anim for end of recents animation
since that will cause the taskbar to quickly show and stash
again, and we know in this case that we'll quickly be launching
right back into an app

Test: Tested w/ live tile + non live,
fullscreen + app pairs
Bug: 316485863

Change-Id: I6ae8cccc01401935bf96fba8a154216e6b1ad701
(cherry picked from commit 637274ebc9)
Merged-In: I6ae8cccc01401935bf96fba8a154216e6b1ad701
2024-04-12 03:41:20 +00:00
Vinit Nayak 32700f81ec 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
(cherry picked from commit cdaabc6199)
Merged-In: I32e394a0bc361489473ee657161c8f3bcbf1e422
2024-04-12 03:24:46 +00:00
Vinit Nayak bddccbdc89 Merge "Set camera icon as gray when app is unlaunchable" into 24D1-dev 2024-04-12 03:20:36 +00:00
Saumya Prakash f44e8e5feb Merge "Adjust where the back button is rendered for new SUW requirements." into 24D1-dev 2024-04-12 00:22:02 +00:00
Jeremy Sim 841e6c1e8e 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
(cherry picked from commit a5e838d61c)
Merged-In: I64ae3db28293fa0adc249d700e9e03c074b6854f
2024-04-12 00:13:39 +00:00
fbaron a7825a70e8 Page resets when scrolling slowly fix
Fix: 324071635
Flag: NONE
Test: Verified manually on RTL and non-RTL
Change-Id: Id778a0a01505d30bca4f216322f3ef3b951e63a7
(cherry picked from commit cae498032f)
2024-04-11 23:47:44 +00:00
Jeremy Sim 1ece740e7a Prevent menu items from showing on split tasks
This CL changes the TaskShortcutFactory for SCREENSHOT and MODAL so that the associated menu options ("Screenshot" and "Select") don't show up on split tasks. These actions are not fully supported on splitscreen tiles (they will only work on one of the two apps), so we disable them.

Bug: 327434215
Flag: N/A
Test: Manual
Change-Id: I121a9c28fa7570f10e13be2de6489182e3362cfc
(cherry picked from commit 6a60c3b113)
Merged-In: I121a9c28fa7570f10e13be2de6489182e3362cfc
2024-04-11 23:41:42 +00:00
Jeremy Sim af645fe110 Delete app pairs on model load if flag is turned off
This CL adds a case to processFolderOrAppPair() -- if the ENABLE_APP_PAIRS flag is turned off, we do not load app pairs into launcher.

This prevents a case where a user uses backup+restore to migrate an app pair onto an environment where app pairs is disabled.

Fixes: 330412376
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: I4a97e4aadc620f8b727439fcdd70ab0e7a3005a8
(cherry picked from commit 08fc2d434f)
Merged-In: I4a97e4aadc620f8b727439fcdd70ab0e7a3005a8
2024-04-11 23:39:10 +00:00
Jeremy Sim ee1fdb4abc Fix bug where app pair title was not updating with language
This CL adds the ability for an app pair icon to update its title string when package changes are detected. It also reorganizes some code in the app pairs classes for readability.

Fixes: 316051810
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: I833e4f9766b7da8c0a3a5fb4b9fc050d8897437e
(cherry picked from commit 24284467b5)
Merged-In: I833e4f9766b7da8c0a3a5fb4b9fc050d8897437e
2024-04-11 23:38:41 +00:00
Saumya Prakash 92b20d89a6 Fix incorrect fragment in gesture tutorial when rotating the screen
This change makes the current fragment load on configuration changes for
the gesture navigation tutorial. Previously, the old fragment would be recreated causing inconsistencies when rotating the screen. Not marking a flag as this change is for both the previous gesture tutorial and the current one.

Fix: 317162126
Test: Run the tutorial and rotate the screen after each step. The
tutorial should progress like normal.
Flag: N/A

Change-Id: I09c40006dd0ef6e9e78fa44e36962a678918420a
(cherry picked from commit c028cc7699)
2024-04-11 22:04:32 +00:00
Saumya Prakash afc6cfcd3b 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
Merged-In: I22680f40c0ddf7cd03ab1da69406eb14184b0174
2024-04-11 21:25:49 +00:00
Jeremy Sim 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)
Merged-In: Ieaf0120cced07b6ac0f3eb07c75b66666a8dcc85
2024-04-11 21:09:56 +00:00
Jeremy Sim 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
Jeremy Sim 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)
Merged-In: I615cb95d51f7c4c120ad306246d9491bf4452229
2024-04-11 20:59:05 +00:00
Vinit Nayak 559aeb2c45 Merge "Allow app pairs in folders" into 24D1-dev 2024-04-11 20:55:33 +00:00
Andreas Agvard 98e57de7a8 Merge "Removes recovery" into 24D1-dev 2024-04-11 19:37:47 +00:00
Treehugger Robot f3313ac56a Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-11 17:26:52 +00:00
Treehugger Robot 2da34d8529 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-11 17:26:52 +00:00
Treehugger Robot 04d38ce5d2 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-11 17:26:52 +00:00
Jeremy Sim 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)
Merged-In: I73732fcaefbdc61bf6e02a5be365962b8bbc3e41
2024-04-11 03:51:53 +00:00
Bill Yi b02a2a31f8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3e262ed2c5bac0ad34a2aeb1412e600e1b4b9f11
2024-04-10 18:55:12 -07:00
Bill Yi d6acf5c87c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id26f1c61bd070906f0ddeaa1fc553fa578105d92
2024-04-10 18:54:16 -07:00
Bill Yi ffdd0fe4cd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4d11fa2ea72763bfbd9875daca8e82f65e08a4a0
2024-04-10 18:53:31 -07:00
Shamali P 335fdf317c Fix issue that old search results list show up momentarily
After exiting the search, we clear the search results and hide the
results lists (because that recycler view shouldn't be accessible after it). However, it often doesn't get chance to layout the empty data.
So, the next time we show the search results list again with new data,
it first animates to clear the old results and then animates in the new
ones. In this fix,
[demo](http://screencast/cast/NDg5OTg2NzIyMTU1NzI0OHxhMTk0NzEzZS1hYw), we swap the adapter to remove any old views, because old search results aren't valid anymore. Spoke with yigit who worked on RV in past and they suggested swapAdapter
was fine for this.

Other options explored:
1. set item animator = null; so, it doesn't animate flushing out old
results -> but we want animations
2. delay the visibility update to let layout happen -> but, if we are
 hiding the section,  why wait making the other UI updates until
layout?

Bug: 274051332
Flag: N/A
Test: Manual
Change-Id: I9f9c5a67b47b5415b2d9e4caa23fd4b6daf7cdea
(cherry picked from commit 809e1a8efb)
2024-04-10 22:24:21 +00:00
Jeremy Sim 00bf2488d1 Reparent folders and app pairs
Previously, app pairs and folders shared a common data model, FolderInfo. Now we need to separate them, so a new type, CollectionInfo, will serve as the parent of both types.

Bug: 315731527
Fixes: 326664798
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual, unit tests to follow
Change-Id: Ia8c429cf6e6a376f2554ae1866549ef0bcab2a22
Merged-In: Ia8c429cf6e6a376f2554ae1866549ef0bcab2a22
2024-04-10 18:44:12 +00:00
Song Chun Fan ca79c70816 [Launcher/Archive] remove all checks for the archiving system property
No longer needed

Change-Id: I62c8843aa04a245d1dcc30f7787c71d17993f5d1
Merged-In: I62c8843aa04a245d1dcc30f7787c71d17993f5d1
BUG: 331165939
Test: builds
2024-04-09 22:05:26 +00:00
Vinit Nayak fc7f52967d Merge "On disabled app pairs, set color tint instead of changing alpha" into 24D1-dev 2024-04-09 05:40:02 +00:00
Vinit Nayak 674aa03862 Add CUJ Jank interactions for App Pair saving and launching
* Added finishCallback consumer to LauncherAccessibilityDelegate
to inform when adding an item to workspace was completed.
* The logic seemed to be dependent on the parameter
"focusForAccessibility", but all callers of that are currently
passing in true

Bug: 328646540
Test: https://paste.googleplex.com/6232597136408576
Newly added CUJs showing up when playing w/ device

Change-Id: Ia4944f8d23634bb92296938ea2d07a6babf6f77c
Merged-In: Ia4944f8d23634bb92296938ea2d07a6babf6f77c
2024-04-09 00:17:21 +00:00
Jeremy Sim 00dc98c9e4 On disabled app pairs, set color tint instead of changing alpha
This CL changes the way disabled app pair icons are drawn: instead of setting alpha, it sets a color filter to indicate disabled status. This brings it in line with other apps icons and V's design specs.

Fixes: 326665140
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: Ifc8ac694f321a6b28996ba9a42860dfc419d5901
Merged-In: Ifc8ac694f321a6b28996ba9a42860dfc419d5901
(cherry picked from commit 09fe96b95a)
2024-04-08 23:37:50 +00:00
Treehugger Robot dcb860a22a Merge "Explicitly set animation and timings for split cancel button" into 24D1-dev 2024-04-06 07:30:28 +00:00
Tony Wickham c189a54ca3 Merge "Apply insets to top-level providers, not just paramsForRotation" into 24D1-dev 2024-04-06 00:01:19 +00:00