Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50641849 authored Jul 13, 2022 by Winson Chung Committed by Automerger Merge Worker Jul 13, 2022

Merge "Extend accessibility timeout indefinitely before overview screenshot"...

Merge "Extend accessibility timeout indefinitely before overview screenshot" into tm-qpr-dev am: 0eb98be7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19251370

Change-Id: Ib1a516a83bf3a1e25405bf4a77a7362bdd00321c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents e16fc5c8 0eb98be7

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -373,6 +373,17 @@ public final class LauncherInstrumentation {
		sActiveContainer = new WeakReference<>(container);
		}

		/**
		* Sets the accesibility interactive timeout to be effectively indefinite (UI using this
		* accesibility timeout will not automatically dismiss if true).
		*/
		void setIndefiniteAccessibilityInteractiveUiTimeout(boolean indefiniteTimeout) {
		final String cmd = indefiniteTimeout
		? "settings put secure accessibility_interactive_ui_timeout_ms 10000"
		: "settings delete secure accessibility_interactive_ui_timeout_ms";
		logShellCommand(cmd);
		}

		public NavigationModel getNavigationModel() {
		final Context baseContext = mInstrumentation.getTargetContext();
		try {

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,8 @@ public class OverviewActions {
		try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
		LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
		"want to click screenshot button and exit screenshot ui")) {
		mLauncher.setIndefiniteAccessibilityInteractiveUiTimeout(true);

		UiObject2 screenshot = mLauncher.waitForObjectInContainer(mOverviewActions,
		"action_screenshot");

		@@ -62,6 +64,8 @@ public class OverviewActions {
		return new Overview(mLauncher);
		}
		}
		} finally {
		mLauncher.setIndefiniteAccessibilityInteractiveUiTimeout(false);
		}
		}