commit d48a6fb4b7aa65833ca80d22b953d02bb2624b95
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 28 23:22:59 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 28 23:22:59 2023 +0000
tree 8c640046c8baccd2a098c3e58f6e3f7058af6194
parent c63702b6b40049abab95322e65b266191163f038
parent dfc94fc05f3a7117d0a87c4aaeadb871724e55dc

Merge "Scroll to top when new header is selected in two pane widget picker" into udc-dev

src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java

diff --git a/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java b/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java
index de7497a..2199473 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java
@@ -23,8 +23,8 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewOutlineProvider;
-import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 
 import androidx.annotation.NonNull;
 
@@ -52,7 +52,7 @@
     private WidgetsListHeader mSuggestedWidgetsHeader;
     private LinearLayout mRightPane;
 
-    private FrameLayout mRightPaneScrollView;
+    private ScrollView mRightPaneScrollView;
     private WidgetsListTableViewHolderBinder mWidgetsListTableViewHolderBinder;
 
     private final ViewOutlineProvider mViewOutlineProviderRightPane = new ViewOutlineProvider() {
@@ -156,6 +156,7 @@
             resetExpandedHeaders();
             mRightPane.removeAllViews();
             mRightPane.addView(mRecommendedWidgetsTable);
+            mRightPaneScrollView.setScrollY(0);
         });
         mSuggestedWidgetsContainer.addView(mSuggestedWidgetsHeader);
     }
@@ -249,6 +250,7 @@
                 };
                 mRightPane.removeAllViews();
                 mRightPane.addView(widgetsRowViewHolder.itemView);
+                mRightPaneScrollView.setScrollY(0);
             }
         };
     }