PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Delaying initializing "is launcher3" flag" into sc-dev am: 3941bc65e3

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

Change-Id: Ie44a4e2f2286b72987446b721d3f65946a17cb1a
This commit is contained in:
TreeHugger Robot
2021-06-02 00:32:51 +00:00
committed by Automerger Merge Worker
parent c15176259d 3941bc65e3
commit fdcc06cd4a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+4 -2
View File
@@ -105,7 +105,7 @@ public final class LauncherInstrumentation {
static final Pattern EVENT_TOUCH_DOWN_TIS = getTouchEventPatternTIS("ACTION_DOWN"); static final Pattern EVENT_TOUCH_DOWN_TIS = getTouchEventPatternTIS("ACTION_DOWN");
static final Pattern EVENT_TOUCH_UP_TIS = getTouchEventPatternTIS("ACTION_UP"); static final Pattern EVENT_TOUCH_UP_TIS = getTouchEventPatternTIS("ACTION_UP");
private final String mLauncherPackage; private final String mLauncherPackage;
private final boolean mIsLauncher3; private Boolean mIsLauncher3;
private long mTestStartTime = -1; private long mTestStartTime = -1;
// Types for launcher containers that the user is interacting with. "Background" is a // Types for launcher containers that the user is interacting with. "Background" is a
@@ -206,7 +206,6 @@ public final class LauncherInstrumentation {
public LauncherInstrumentation(Instrumentation instrumentation) { public LauncherInstrumentation(Instrumentation instrumentation) {
mInstrumentation = instrumentation; mInstrumentation = instrumentation;
mDevice = UiDevice.getInstance(instrumentation); mDevice = UiDevice.getInstance(instrumentation);
mIsLauncher3 = "com.android.launcher3".equals(getLauncherPackageName());
// Launcher should run in test harness so that custom accessibility protocol between // Launcher should run in test harness so that custom accessibility protocol between
// Launcher and TAPL is enabled. In-process tests enable this protocol with a direct call // Launcher and TAPL is enabled. In-process tests enable this protocol with a direct call
@@ -1422,6 +1421,9 @@ public final class LauncherInstrumentation {
} }
boolean isLauncher3() { boolean isLauncher3() {
if (mIsLauncher3 == null) {
mIsLauncher3 = "com.android.launcher3".equals(getLauncherPackageName());
}
return mIsLauncher3; return mIsLauncher3;
} }