From 7c6f770a4133d3386ca3f07400f968806bea42d6 Mon Sep 17 00:00:00 2001
From: Fengjiang Li <fengjial@google.com>
Date: Thu, 7 Mar 2024 14:45:15 -0800
Subject: [PATCH] [Predictive Back] Don't hide/reveal scroll bar in predictive
 back swipe in 2 pane widget picker

Fix: 328639347
Test: Manual - took a video
Flag: aconfig com.android.launcher3.enable_predictive_back_gesture TEAMFOOD
Change-Id: I909cca47477d75c2dd9b861e3c7812b9540e6fa1
---
 .../widget/picker/WidgetsFullSheet.java        | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

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