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

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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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");

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

@@ -56,4 +56,10 @@ public class AllAppsFromTaskbar extends AllApps {
         return mLauncher.getTestInfo(TestProtocol.REQUEST_TASKBAR_ALL_APPS_TOP_PADDING)
                 .getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);
     }
+
+    @Override
+    protected int getAllAppsScroll() {
+        return mLauncher.getTestInfo(TestProtocol.REQUEST_TASKBAR_APPS_LIST_SCROLL_Y)
+                .getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);
+    }
 }

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

@@ -118,4 +118,10 @@ public class HomeAllApps extends AllApps {
     public Qsb getQsb() {
         return new AllAppsQsb(mLauncher, verifyActiveContainer());
     }
+
+    @Override
+    protected int getAllAppsScroll() {
+        return mLauncher.getTestInfo(TestProtocol.REQUEST_APPS_LIST_SCROLL_Y)
+                .getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);
+    }
 }