diff options
| -rw-r--r-- | res/values/config.xml | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 14 | ||||
| -rw-r--r-- | tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index f462b9c53..8d31bd271 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -148,6 +148,4 @@ <item type="id" name="overview_panel"/> <integer name="config_recentsMaxThumbnailCacheSize">6</integer> <integer name="config_recentsMaxIconCacheSize">12</integer> - - <item name="workspace_page_container" type="id" /> </resources> diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index a9979a218..5cca2fb6f 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -54,6 +54,7 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; +import android.view.accessibility.AccessibilityNodeInfo; import android.widget.Toast; import com.android.launcher3.Launcher.LauncherOverlay; @@ -549,7 +550,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator> // created CellLayout. CellLayout newScreen = (CellLayout) LayoutInflater.from(getContext()).inflate( R.layout.workspace_screen, this, false /* attachToRoot */); - newScreen.getShortcutsAndWidgets().setId(R.id.workspace_page_container); int paddingLeftRight = mLauncher.getDeviceProfile().cellLayoutPaddingLeftRightPx; int paddingBottom = mLauncher.getDeviceProfile().cellLayoutBottomPaddingPx; newScreen.setPadding(paddingLeftRight, 0, paddingLeftRight, paddingBottom); @@ -1495,6 +1495,18 @@ public class Workspace extends PagedView<WorkspacePageIndicator> } } + @Override + public AccessibilityNodeInfo createAccessibilityNodeInfo() { + if (getImportantForAccessibility() == IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS) { + // TAPL tests verify that workspace is not present in Overview and AllApps states. + // TAPL can work only if UIDevice is set up as setCompressedLayoutHeirarchy(false). + // Hiding workspace from the tests when it's + // IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS. + return null; + } + return super.createAccessibilityNodeInfo(); + } + private void updateAccessibilityFlags(int accessibilityFlag, CellLayout page) { page.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO); page.getShortcutsAndWidgets().setImportantForAccessibility(accessibilityFlag); diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 0be09f0d9..bf8f64efc 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -134,12 +134,14 @@ public final class LauncherInstrumentation { return waitForLauncherObject(WIDGETS_RES_ID); } case ALL_APPS: { + waitUntilGone(WORKSPACE_RES_ID); waitUntilGone(OVERVIEW_RES_ID); waitUntilGone(WIDGETS_RES_ID); return waitForLauncherObject(APPS_RES_ID); } case OVERVIEW: { waitForLauncherObject(APPS_RES_ID); + waitUntilGone(WORKSPACE_RES_ID); waitUntilGone(WIDGETS_RES_ID); return waitForLauncherObject(OVERVIEW_RES_ID); } |