Merge "Enabling more checks in TAPL tests." into ub-launcher3-master (589f53cf) · Commits · e / os / BlissLauncher3

res/values/config.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -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>

src/com/android/launcher3/Workspace.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -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);

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}