Ensure "AppIconSelector" does not match folders.
Not sure if this is considered brittle, but at this moment, the
BubbleTextView used for folder labels is not focusable, while the
one used for app labels is focusable.
Also add package name to the context logs to help debug similar
test failures in the future.
Fix: 319194153
Test: atest android.platform.test.scenario.google.OpenAppMicrobenchmark$1#testOpen
Flag: NA
Change-Id: Ibf88afdd6d3ef03b75ea44910b485e7e74e348b0
diff --git a/tests/tapl/com/android/launcher3/tapl/AppIcon.java b/tests/tapl/com/android/launcher3/tapl/AppIcon.java
index 867a1a8..156568b 100644
--- a/tests/tapl/com/android/launcher3/tapl/AppIcon.java
+++ b/tests/tapl/com/android/launcher3/tapl/AppIcon.java
@@ -42,7 +42,8 @@
* @param appName app icon to look for
*/
static BySelector getAppIconSelector(String appName) {
- return By.clazz(TextView.class).text(makeMultilinePattern(appName));
+ // focusable=true to avoid matching folder labels
+ return By.clazz(TextView.class).text(makeMultilinePattern(appName)).focusable(true);
}
/**
diff --git a/tests/tapl/com/android/launcher3/tapl/Launchable.java b/tests/tapl/com/android/launcher3/tapl/Launchable.java
index 28e2590..ed47334 100644
--- a/tests/tapl/com/android/launcher3/tapl/Launchable.java
+++ b/tests/tapl/com/android/launcher3/tapl/Launchable.java
@@ -56,8 +56,8 @@
*/
public LaunchedAppState launch(String expectedPackageName) {
try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck()) {
- try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(
- "want to launch an app from " + launchableType())) {
+ try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(String.format(
+ "want to launch an app (%s) from %s", expectedPackageName, launchableType()))) {
LauncherInstrumentation.log("Launchable.launch before click "
+ mObject.getVisibleCenter() + " in "
+ mLauncher.getVisibleBounds(mObject));