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

Commit 91b0e2d6 authored Apr 19, 2023 by Brian Isganitis Committed by Android (Google) Code Review Apr 19, 2023

Merge "Properly compute scroll for Taskbar All Apps." into udc-dev

parents 028dc7b0 01be7eeb

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1129,4 +1129,9 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
		public int getTaskbarAllAppsTopPadding() {
		return mControllers.taskbarAllAppsController.getTaskbarAllAppsTopPadding();
		}

		@VisibleForTesting
		public int getTaskbarAllAppsScroll() {
		return mControllers.taskbarAllAppsController.getTaskbarAllAppsScroll();
		}
		}

quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -149,4 +149,10 @@ public final class TaskbarAllAppsController {
		// Allow null-pointer since this should only be null if the apps view is not showing.
		return mAppsView.getActiveRecyclerView().getClipBounds().top;
		}

		@VisibleForTesting
		public int getTaskbarAllAppsScroll() {
		// Allow null-pointer since this should only be null if the apps view is not showing.
		return mAppsView.getActiveRecyclerView().computeVerticalScrollOffset();
		}
		}

quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,13 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
		.getTaskbarAllAppsTopPadding());
		}

		case TestProtocol.REQUEST_TASKBAR_APPS_LIST_SCROLL_Y: {
		return getTISBinderUIProperty(Bundle::putInt, tisBinder ->
		tisBinder.getTaskbarManager()
		.getCurrentActivityContext()
		.getTaskbarAllAppsScroll());
		}

		case TestProtocol.REQUEST_ENABLE_BLOCK_TIMEOUT:
		runOnTISBinder(tisBinder -> {
		enableBlockingTimeout(tisBinder, true);

tests/shared/com/android/launcher3/testing/shared/TestProtocol.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@ public final class TestProtocol {
		public static final String REQUEST_RECREATE_TASKBAR = "recreate-taskbar";
		public static final String REQUEST_APP_LIST_FREEZE_FLAGS = "app-list-freeze-flags";
		public static final String REQUEST_APPS_LIST_SCROLL_Y = "apps-list-scroll-y";
		public static final String REQUEST_TASKBAR_APPS_LIST_SCROLL_Y = "taskbar-apps-list-scroll-y";
		public static final String REQUEST_WIDGETS_SCROLL_Y = "widgets-scroll-y";
		public static final String REQUEST_TARGET_INSETS = "target-insets";
		public static final String REQUEST_WINDOW_INSETS = "window-insets";

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -261,10 +261,7 @@ public abstract class AllApps extends LauncherInstrumentation.VisibleContainer {
		}
		}

		private int getAllAppsScroll() {
		return mLauncher.getTestInfo(TestProtocol.REQUEST_APPS_LIST_SCROLL_Y)
		.getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);
		}
		protected abstract int getAllAppsScroll();

		protected UiObject2 getAppListRecycler(UiObject2 allAppsContainer) {
		return mLauncher.waitForObjectInContainer(allAppsContainer, "apps_list_view");