Merge "Better diagnose Launcher state when there is an open folder." into udc-dev am: 2b24e53531
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774276 Change-Id: I155239f762365a323a11ec64d8fff8024ea6f2d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -177,6 +177,7 @@ public final class LauncherInstrumentation {
|
|||||||
private static final String OVERVIEW_RES_ID = "overview_panel";
|
private static final String OVERVIEW_RES_ID = "overview_panel";
|
||||||
private static final String WIDGETS_RES_ID = "primary_widgets_list_view";
|
private static final String WIDGETS_RES_ID = "primary_widgets_list_view";
|
||||||
private static final String CONTEXT_MENU_RES_ID = "popup_container";
|
private static final String CONTEXT_MENU_RES_ID = "popup_container";
|
||||||
|
private static final String OPEN_FOLDER_RES_ID = "folder_content";
|
||||||
static final String TASKBAR_RES_ID = "taskbar_view";
|
static final String TASKBAR_RES_ID = "taskbar_view";
|
||||||
private static final String SPLIT_PLACEHOLDER_RES_ID = "split_placeholder";
|
private static final String SPLIT_PLACEHOLDER_RES_ID = "split_placeholder";
|
||||||
public static final int WAIT_TIME_MS = 30000;
|
public static final int WAIT_TIME_MS = 30000;
|
||||||
@@ -560,6 +561,7 @@ public final class LauncherInstrumentation {
|
|||||||
|
|
||||||
private String getVisibleStateMessage() {
|
private String getVisibleStateMessage() {
|
||||||
if (hasLauncherObject(CONTEXT_MENU_RES_ID)) return "Context Menu";
|
if (hasLauncherObject(CONTEXT_MENU_RES_ID)) return "Context Menu";
|
||||||
|
if (hasLauncherObject(OPEN_FOLDER_RES_ID)) return "Open Folder";
|
||||||
if (hasLauncherObject(WIDGETS_RES_ID)) return "Widgets";
|
if (hasLauncherObject(WIDGETS_RES_ID)) return "Widgets";
|
||||||
if (hasSystemLauncherObject(OVERVIEW_RES_ID)) return "Overview";
|
if (hasSystemLauncherObject(OVERVIEW_RES_ID)) return "Overview";
|
||||||
if (hasLauncherObject(WORKSPACE_RES_ID)) return "Workspace";
|
if (hasLauncherObject(WORKSPACE_RES_ID)) return "Workspace";
|
||||||
|
|||||||
Reference in New Issue
Block a user