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
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
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
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
This reverts commit 38bc885de9.
- Always request layout of action_buttons after changing visibility of its children
- Update Split button visibility based on DeviceProfile change in updateDimension() only
- Update Split button visibility based on 3P launcher in initialization only
- Also simplified action_buttons to wrap_content and layout in middle of parent
- Also removed the space between buttons and use marginStart
- Fixed TAPL to not expect save app pair button on phone. Before this CL actions_buttons are still on view hierarchy despite they're not visible on screen.
Fix: 321291049
Fix: 329255757
Test: Clear all tasks, fold, launch app, swipe up to Overivew; repeat in RTL
Test: OverviewImageTest
Flag: None
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7d0edb46ac0a09aa0c801598b46cd338d04886a9)
Merged-In: I9ecf872279f6f07d2d9bc33fb09031568023cb77
Change-Id: I9ecf872279f6f07d2d9bc33fb09031568023cb77
Will now repurpose the twolinetoggle flag to be the flag that will
make twoline text enabled/disabled.
bug: 316027081
Test: presubmit
manually: https://screenshot.googleplex.com/BsZGCm7DrTZLwG4
Flag: com.android.launcher3.enable_twoline_toggle Staging
Merged-In: Idef427bad6551ae56b13e35393e076b8e000af5a
Change-Id: Idef427bad6551ae56b13e35393e076b8e000af5a
Revert submission 26420318-revert-26391074-save-app-pair-button-ZKCRCDSCSN
Reason for revert: Test failure in question wasn't related to this topic b/328016248
Reverted changes: /q/submissionid:26420318-revert-26391074-save-app-pair-button-ZKCRCDSCSN
Change-Id: I2a4dbb83720768a9d29a4371c77e3b9410ab2fea
Merged-In: I2a4dbb83720768a9d29a4371c77e3b9410ab2fea
Second attempt at enabling this feature. See ag/25143701, linked bugs, and revert history for details. This patch is tested with mokey devices and does not crash!
This patch includes:
- Ability to "save app pair" from Overview Actions.
- Internally the actions bar is not longer hidden for GroupedTasks; instead the individual buttons for "Select", "Screenshot", and "Split screen" are toggled off and "Save app pair" is toggled on.
- "Save app pair" option does not appear in icon menu when it is visible in the Actions Bar.
- Addition to go/quickstep/res/layout/overview_actions_container.xml to support addition of the new button.
Note: This patch introduces a slight regression where users are now able to long-press to select text on task 1 of a paired GroupedTaskView (previously we did not let them select text on either task for consistency.) Will follow up with a fix -- see bug for details.
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Fixes: 315545418
Fixes: 315292030
Test: Manual, all action buttons still work and "Save app pair" appears and disappears correctly
Change-Id: I4b4ac525cfd5eb9cfcd757d0bffc7215b04f9a3d
I’ve never seen a useful failure from these checks, and now I’m seeing a false positive error. That error is fixable by reworking the code, but I think the value of these checks is not worth the effort.
Bug: 322823209
Test: presubmit
Flag: N/A
Change-Id: If675dad254fb82a2a842ef3f9054936f38de1cff
This reverts commit 21ab3b979b.
Reason for revert: Culprit for b/326611479. Will be verifying through ABTD for confirmation and before submitting the revert.
Change-Id: Ib71791d159b3ac65ca332f58500341a1a0fe36e1
launcher logic.
Sunny suggested to remove this test b/325283522 because we shouldn't
have any platform logic in these launchers tests.
Test: N/A
Bug: 325283522
Flag: NA
Change-Id: I6a8eea815e0cf5951f98030063447fe5fd0142eb