Commit Graph

3569 Commits

Author SHA1 Message Date
Sebastian Franco
8c3d830b39 Making 2 flags read only since they are used on backup and restore
The flags are narrow_grid_restore and grid_migration_fix.

Flag: ACONFIG enable_grid_migration_fix enabled
Flag: ACONFIG enable_narrow_grid_restore enabled
Bug: 325286145
Bug: 325285743
Test: BackupAndRestoreDBSelectionTest.kt
Test: GridMigrationTest.kt
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5ea61960ab4b0da02aeb5dd36968c2ef923709aa)
Merged-In: Ia6a439553c3c5098115144eae532342ce73be4f2
Change-Id: Ia6a439553c3c5098115144eae532342ce73be4f2
2024-04-22 16:15:30 +00:00
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
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
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
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
Alex Chau
ddb12d7a0c Reland "Update Split button visibility based on DeviceProfile change"
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
2024-04-04 12:19:44 +00:00
Brandon Dayauon
50f9dbd0a5 Disable two line text legacy flag.
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
2024-03-27 17:07:04 +00:00
fbaron
b41c826c6a Fix bug where folder with 1 icon can exist
Fix: 329357132
Flag: NONE
Test: TaplDragTest
Change-Id: If381ff56e051c89e9f6162f8a44f8df9e2ae5060
(cherry picked from commit 5645c3ec55)
2024-03-15 16:11:26 +00:00
Vinit Nayak
14d28ad455 Revert "Revert "Implements the "Save App Pair" button in Overvie..."
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
2024-03-11 05:00:47 +00:00
Uwais Ashraf
9c2f5a4c62 Remove classes related to E2E testing from deviceless test classpath
Fix: 327187136
Flag: NA
Test: gradlew :NexusLauncher:testGoogleWithQuickstepDebugUnitTest
Test: atest Launcher3RoboTests
Test: presubmits passing
Change-Id: I4f05524bdc55d8473f3b5115cc239eb8cc48a856
2024-03-04 13:45:32 +00:00
PODISHETTY KUMAR
b588e4618b Merge "Revert "Implements the "Save App Pair" button in Overview Actions"" into main 2024-03-01 09:27:08 +00:00
Vinit Nayak
5c8978c4db Revert "Implements the "Save App Pair" button in Overview Actions"
Revert submission 26391074-save-app-pair-button

Reason for revert: breaks image comparison tests b/327665771
Reverted changes: /q/submissionid:26391074-save-app-pair-button

Change-Id: Ic4580fc39d8394771551f100932157e6ef35c4b7
2024-03-01 01:02:35 +00:00
Jeremy Sim
8c383aceda Merge "Implements the "Save App Pair" button in Overview Actions" into main 2024-02-29 19:47:20 +00:00
Vadim Tryshev
0fa523bb32 Merge "Removing logging for verifying internal Launcher state from tests" into main 2024-02-29 19:18:04 +00:00
Federico Baron
835b9610bc Merge "Update some dimens for portrait edit state" into main 2024-02-29 17:17:19 +00:00
Jeremy Sim
41d8ae8a7a Implements the "Save App Pair" button in Overview Actions
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
2024-02-28 19:39:04 -08:00
Federico Baron
b68a6e581c Merge "Add ScreenRecord for workTabExists tapl test" into main 2024-02-29 02:56:55 +00:00
Treehugger Robot
e5f02039eb Merge "Debugging Logs for TaplDragTest#testDragAppIconToMultipleWorkspaceCells" into main 2024-02-28 23:59:38 +00:00
fbaron
bd528add50 Add ScreenRecord for workTabExists tapl test
Bug: 325383911
Test: TaplWorkProfileTest#workTabExists
Flag: NONE
Change-Id: I83c92376b16c9b0de352a03ce297e7a9ae51123d
2024-02-28 12:07:49 -08:00
Sukesh Ram
872b9f9a61 Debugging Logs for TaplDragTest#testDragAppIconToMultipleWorkspaceCells
Add logging for TaplDragTest#testDragAppIconToMultipleWorkspaceCells.

Flag: NONE
Test: Manually tested in pixel 7.
Bug: 326908466
Change-Id: Icb3262d6af66c9b947cb0cc92c1c67556fba315f
2024-02-28 19:28:07 +00:00
Vadim Tryshev
544f6e228c Add TestStabilityRule so that @Stability annotation works
Bug: 319923578
Test: presubmit
Flag: N/A
Change-Id: I5613a2ee658a458871ea89219764d13796d07b83
2024-02-28 18:27:39 +00:00
Federico Baron
6f7916d647 Merge "Fix TaplOpenCloseAllAppsTest#testAllAppsFromHome" into main 2024-02-28 06:17:13 +00:00
Sukesh Ram
1909570ed3 Debugging Logs for TaplOverviewIconTest#testOverviewActionsMenu
Add logging for TaplOverviewIconTest#testOverviewActionsMenu.

Flag: NONE
Test: Manually tested in pixel 7.
Bug: 326073471
Change-Id: I5f08192bb1143c1d23f8884bb207ce69c5830a41
2024-02-28 01:06:14 +00:00
fbaron
f1bbcbd743 Fix TaplOpenCloseAllAppsTest#testAllAppsFromHome
Bug: 322228038
Flag: NONE
Test: TaplOpenCloseAllAppsTest#testAllAppsFromHome
Change-Id: I13b31dc16fca02a4e8770aca56e35e8606dd21b3
2024-02-27 16:24:10 -08:00
Treehugger Robot
90182bffc1 Merge "Debugging Logs for TaplTestsTransientTaskbar#testSwipeToStashAndUnstash" into main 2024-02-28 00:02:38 +00:00
Vadim Tryshev
dae8b65dea Removing logging for verifying internal Launcher state from tests
Bug: 322823209
Test: presubmit
Flag: N/A
Change-Id: I25afcc30446d429171445f8e1b6033b277166725
2024-02-27 20:23:49 +00:00
Sukesh Ram
41c2a9a900 Debugging Logs for TaplTestsTransientTaskbar#testSwipeToStashAndUnstash
Add logging for TaplTestsTransientTaskbar#testSwipeToStashAndUnstash.

Flag: NONE
Test: Manually tested in pixel 7.
Bug: 324940434
Change-Id: I1309e8c1b2ce7b6c06cb520818ef109bbf2f2d23
2024-02-27 19:36:55 +00:00
Fengjiang Li
f0c0bb493d Merge "Fix bug where TAPL test is checking test's ApplicationInfo" into main 2024-02-27 18:29:37 +00:00
Vadim Tryshev
2b5c4d51a5 Merge "Demote from presubmit a set of flaking tests" into main 2024-02-27 17:11:09 +00:00
Himanshu Gupta
dcf394535a Merge "Making Settings Cog open PS Settings page." into main 2024-02-27 15:46:34 +00:00
Helen Cheuk
96fd73ed84 Merge "Stash taskbar when software keyboard is docked" into main 2024-02-27 10:40:07 +00:00
fbaron
3bb6d4bd81 Update some dimens for portrait edit state
Fix: 324133830
Flag: NONE
Test: HomeScreenEditImageTest
Change-Id: I7f42664b63e6981bcef5db2e76129bd3fe567102
2024-02-27 06:57:55 +00:00
Fengjiang Li
9f86b17c2c Fix bug where TAPL test is checking test's ApplicationInfo
Bug: 326118348
Test: This is the test
Flag: NONE
Change-Id: I7519727366b1ad03a50da07d6d331135fdcb89a4
2024-02-26 19:03:55 -08:00
Vadim Tryshev
0c7fd04a8f Removing verifying internal Launcher state from tests
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
2024-02-26 10:44:57 -08:00
Vadim Tryshev
0b32b7a9cb Merge "Add tracing for a bug where current RecentsActivity is null" into main 2024-02-26 18:33:31 +00:00
Jakob Schneider
c93dc0e52a Merge "Remove archiving test because it tests platform specifics instead of launcher logic." into main 2024-02-26 18:26:18 +00:00
Vadim Tryshev
3d02d86872 Demote from presubmit a set of flaking tests
Bug: 319923578
Test: presubmit
Flag: N/A
Change-Id: Icd18cbe386b5cab9ac33b0b74ad0d2d8a40fa5c3
2024-02-26 10:18:54 -08:00
Jordan Silva
36304fd1c6 Merge "Add function to start a test activity with different name and label" into main 2024-02-26 11:33:51 +00:00
Andy Wickham
525163d0c7 Merge "Use setFlags to disable two line toggle flag in tests." into main 2024-02-25 08:09:39 +00:00
Treehugger Robot
45181a668b Merge "Focus a task by default when using keyboard to go to overview." into main 2024-02-23 19:08:01 +00:00
Priyanka Advani
d0a1c2c023 Merge "Revert "Remove Unused parts of LauncherPrefs causing cyclical dependency."" into main 2024-02-23 18:11:50 +00:00
Priyanka Advani
a80997d9eb Revert "Remove Unused parts of LauncherPrefs causing cyclical dependency."
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
2024-02-23 18:05:39 +00:00
Jakob Schneider
07c1c98dab Remove archiving test because it tests platform specifics instead of
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
2024-02-23 16:20:30 +00:00
Pat Manning
5aa23d41dd Focus a task by default when using keyboard to go to overview.
Fix: 322898816
Test: TaplTestsQuickstep.java
Flag: None.
Change-Id: I6d4b0ca6593ed2ac7c7d8793954c36e55b5978de
2024-02-23 12:22:06 +00:00
Federico Baron
cda8adfad3 Merge "Fix testDragToFolder()" into main 2024-02-23 00:41:55 +00:00
Vadim Tryshev
c94b2a7045 Add tracing for a bug where current RecentsActivity is null
Bug: 321775748
Test: presubmit
Flag: N/A
Change-Id: I46fde7a73a3bfe02ed6276b4ac5f3e6c33bda387
2024-02-22 16:19:16 -08:00
Sunny Goyal
1d6f76f811 Merge "Adding support for async view inflation" into main 2024-02-22 22:38:41 +00:00
Brandon Dayauon
b177c9226e Use setFlags to disable two line toggle flag in tests.
disableFlags for Flags.FLAG_ENABLED_TWOLINE_TOGGLE

bug: 316027081
Test: presubmit/gantry/manual
BubbleTextViewTest: https://screenshot.googleplex.com/8zFHWbwCFyxTTHC
Flag: com.android.launcher3.enable_twoline_toggle DEVELOPMENT
Change-Id: I530126de6ac63395acd2d176935e6f6f9759d4c3
2024-02-22 14:19:31 -08:00