Merge "Diagnosing launcher visible state in TAPL" into ub-launcher3-qt-r1-dev

1 files changed, 15 insertions, 1 deletions

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 2cda7b766..11b0665d9 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -270,11 +270,21 @@ public final class LauncherInstrumentation {
             return "System alert popup is visible: " + object.getText();
         }
 
+        if (hasSystemUiObject("keyguard_status_view")) return "Phone is locked";
+
         if (!mDevice.hasObject(By.textStartsWith(""))) return "Screen is empty";
 
         return null;
     }
 
+    private String getVisibleStateMessage() {
+        if (hasLauncherObject(WIDGETS_RES_ID)) return "Widgets";
+        if (hasLauncherObject(OVERVIEW_RES_ID)) return "Overview";
+        if (hasLauncherObject(WORKSPACE_RES_ID)) return "Workspace";
+        if (hasLauncherObject(APPS_RES_ID)) return "AllApps";
+        return "Background";
+    }
+
     private static String truncateCrash(String text, int maxLines) {
         String[] lines = text.split("\\r?\\n");
         StringBuilder ret = new StringBuilder();
@@ -354,7 +364,11 @@ public final class LauncherInstrumentation {
         message = "http://go/tapl : " + getContextDescription() + message;
 
         final String anomaly = getAnomalyMessage();
-        if (anomaly != null) message = anomaly + ", which causes:\n" + message;
+        if (anomaly != null) {
+            message = anomaly + ", which causes:\n" + message;
+        } else {
+            message = message + " (visible state: " + getVisibleStateMessage() + ")";
+        }
 
         final String systemHealth = getSystemHealthMessage();
         if (systemHealth != null) {