aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 15:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Scrolling down to locate PS after lock/unlock event." into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-06-11 20:24:17 +00:00
committed by Android (Google) Code Review
parent a8f0155c89 3a4b79bf7b
commit 0f83d92ae4
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
quickstep/tests/src/com/android/quickstep/TaplPrivateSpaceTest.java
View File

@@ -49,6 +49,7 @@ public class TaplPrivateSpaceTest extends AbstractQuickStepTest {
private static final String PRIVATE_PROFILE_NAME = "LauncherPrivateProfile";
private static final String INSTALLED_APP_NAME = "Aardwolf";
private static final int MAX_STATE_TOGGLE_TRIES = 2;
private static final String TAG = "TaplPrivateSpaceTest";
@Override
@@ -172,7 +173,9 @@ public class TaplPrivateSpaceTest extends AbstractQuickStepTest {
HomeAllApps homeAllApps = mLauncher.getAllApps();
// Disable Private Space
togglePrivateSpace(PrivateProfileManager.STATE_DISABLED, homeAllApps);
togglePrivateSpaceWithRetry(PrivateProfileManager.STATE_DISABLED, homeAllApps);
// Scroll to the bottom of All Apps
executeOnLauncher(launcher -> launcher.getAppsView().resetAndScrollToPrivateSpaceHeader());
homeAllApps.freeze();
try {
@@ -184,7 +187,9 @@ public class TaplPrivateSpaceTest extends AbstractQuickStepTest {
}
// Enable Private Space
togglePrivateSpace(PrivateProfileManager.STATE_ENABLED, homeAllApps);
togglePrivateSpaceWithRetry(PrivateProfileManager.STATE_ENABLED, homeAllApps);
// Scroll to the bottom of All Apps
executeOnLauncher(launcher -> launcher.getAppsView().resetAndScrollToPrivateSpaceHeader());
homeAllApps.freeze();
try {
@@ -217,6 +222,25 @@ public class TaplPrivateSpaceTest extends AbstractQuickStepTest {
waitForLauncherUIUpdate();
}
private void togglePrivateSpaceWithRetry(int state, HomeAllApps homeAllApps) {
int togglePsCount = 0;
boolean shouldRetry;
do {
togglePsCount ++;
try {
togglePrivateSpace(state, homeAllApps);
// No need to retry if the toggle was successful.
shouldRetry = false;
} catch (AssertionError error) {
if (togglePsCount < MAX_STATE_TOGGLE_TRIES) {
shouldRetry = true;
} else {
throw error;
}
}
} while (shouldRetry);
}
private void waitForPrivateSpaceSetup() {
waitForLauncherCondition("Private Profile not setup",
launcher -> launcher.getAppsView().hasPrivateProfile(),