aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 00:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Waiting for the apps-unfreeze flags instead of enforcing it" into tm-qpr-dev am: 5602b9e0ad

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20391177

Change-Id: Ie000940cccdf0ddc307b4370907cfd077a891b71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-11-05 05:58:20 +00:00
committed by Automerger Merge Worker
parent 924e673804 5602b9e0ad
commit 2f632f09e9
3 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
View File

@@ -335,6 +335,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
@IwTest(focusArea="launcher")
@Test
@PortraitLandscape
@ScreenRecord // b/256898879
public void testDragAppIcon() throws Throwable {
// 1. Open all apps and wait for load complete.
// 2. Drag icon to homescreen.

16
tests/tapl/com/android/launcher3/tapl/AllApps.java
View File

@@ -16,6 +16,9 @@
package com.android.launcher3.tapl;
import static com.android.launcher3.tapl.LauncherInstrumentation.DEFAULT_POLL_INTERVAL;
import static com.android.launcher3.tapl.LauncherInstrumentation.WAIT_TIME_MS;
import android.graphics.Point;
import android.graphics.Rect;
import android.os.Bundle;
@@ -37,6 +40,9 @@ import java.util.stream.Collectors;
* Operations on AllApps opened from Home. Also a parent for All Apps opened from Overview.
*/
public abstract class AllApps extends LauncherInstrumentation.VisibleContainer {
// Defer updates flag used to defer all apps updates by a test's request.
private static final int DEFER_UPDATES_TEST = 1 << 1;
private static final int MAX_SCROLL_ATTEMPTS = 40;
private final int mHeight;
@@ -292,12 +298,16 @@ public abstract class AllApps extends LauncherInstrumentation.VisibleContainer {
*/
public void unfreeze() {
mLauncher.getTestInfo(TestProtocol.REQUEST_UNFREEZE_APP_LIST);
verifyNotFrozen("All apps freeze flags upon unfreezing");
}
private void verifyNotFrozen(String message) {
mLauncher.assertEquals(message, 0, getFreezeFlags() & DEFER_UPDATES_TEST);
mLauncher.assertTrue(message, mLauncher.waitAndGet(() -> getFreezeFlags() == 0,
WAIT_TIME_MS, DEFAULT_POLL_INTERVAL));
}
private int getFreezeFlags() {
final Bundle testInfo = mLauncher.getTestInfo(TestProtocol.REQUEST_APP_LIST_FREEZE_FLAGS);
if (testInfo == null) return;
mLauncher.assertEquals(message, 0, testInfo.getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD));
return testInfo == null ? 0 : testInfo.getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);
}
}

19
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
View File

@@ -83,6 +83,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeoutException;
import java.util.function.BooleanSupplier;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -181,6 +182,7 @@ public final class LauncherInstrumentation {
static final String TASKBAR_RES_ID = "taskbar_view";
private static final String SPLIT_PLACEHOLDER_RES_ID = "split_placeholder";
public static final int WAIT_TIME_MS = 30000;
static final long DEFAULT_POLL_INTERVAL = 1000;
private static final String SYSTEMUI_PACKAGE = "com.android.systemui";
private static final String ANDROID_PACKAGE = "android";
@@ -1991,4 +1993,21 @@ public final class LauncherInstrumentation {
mCallbackAtRunPoint.accept(runPoint);
}
}
/**
* Waits until a particular condition is true. Based on WaitMixin.
*/
boolean waitAndGet(BooleanSupplier condition, long timeout, long interval) {
long startTime = SystemClock.uptimeMillis();
boolean result = condition.getAsBoolean();
for (long elapsedTime = 0; !result; elapsedTime = SystemClock.uptimeMillis() - startTime) {
if (elapsedTime >= timeout) {
break;
}
SystemClock.sleep(interval);
result = condition.getAsBoolean();
}
return result;
}
}