diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java index f5742af9f6..c0f1070b3d 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java @@ -291,13 +291,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet attachScrollbarToRecyclerView(currentRecyclerView); } - @Override - @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE) - public void onBackProgressed(@NonNull BackEvent backEvent) { - super.onBackProgressed(backEvent); - mFastScroller.setVisibility(backEvent.getProgress() > 0 ? View.INVISIBLE : View.VISIBLE); - } - private void attachScrollbarToRecyclerView(WidgetsRecyclerView recyclerView) { recyclerView.bindFastScrollbar(mFastScroller); if (mCurrentWidgetsRecyclerView != recyclerView) { @@ -862,6 +855,17 @@ public class WidgetsFullSheet extends BaseWidgetSheet return isFoldUnFold || useDifferentLayoutOnOrientationChange; } + @Override + @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE) + public void onBackProgressed(@NonNull BackEvent backEvent) { + super.onBackProgressed(backEvent); + // In two pane picker, scroll bar is always hidden. + if (!isTwoPane()) { + mFastScroller.setVisibility( + backEvent.getProgress() > 0 ? View.INVISIBLE : View.VISIBLE); + } + } + @Override public void onBackInvoked() { if (mIsInSearchMode) {