commit f74c7a737d380f129c5891868ea7075ee43c6860
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 16 17:25:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 16 17:25:51 2021 +0000
tree 36eb3d4531c2c87cbfeee0aa6f38047e726670ac
parent a635b031201c917edb51231040de201c63f2af09
parent a53e01e42d37fb2b17ed1d5da281f3e812c88f27

Merge "Scroll AllApps to top when new padding is set." into sc-v2-dev am: 460e2c4299 am: a53e01e42d

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

Change-Id: I1244f3cec5d693a2493c35cb3fc16a5d6ecceb46

src/com/android/launcher3/allapps/AllAppsContainerView.java

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index e779ee8..e659aba 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -624,6 +624,9 @@
         for (int i = 0; i < mAH.length; i++) {
             mAH[i].padding.top = padding;
             mAH[i].applyPadding();
+            if (mAH[i].recyclerView != null) {
+                mAH[i].recyclerView.scrollToTop();
+            }
         }
         mHeaderTop = mHeader.getTop();
     }

src/com/android/launcher3/allapps/FloatingHeaderRow.java

diff --git a/src/com/android/launcher3/allapps/FloatingHeaderRow.java b/src/com/android/launcher3/allapps/FloatingHeaderRow.java
index 9bf6043..6ff2132 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderRow.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderRow.java
@@ -47,6 +47,8 @@
 
     /**
      * Scrolls the content vertically.
+     * @param scroll scrolled distance in pixels for active recyclerview.
+     * @param isScrolledOut bool to determine if row is scrolled out of view
      */
     void setVerticalScroll(int scroll, boolean isScrolledOut);