commit 460e2c4299082d0f5409332d50c0ed6ef5911065
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 16 17:01:22 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 16 17:01:22 2021 +0000
tree e2ba498eaed863c527a4442c75cea7399598d2e7
parent 25e84690b3a406260abe860c4fc95fe218b89016
parent 2397d60074200964d09877c067199329deac11ff

Merge "Scroll AllApps to top when new padding is set." into sc-v2-dev

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