Merge "[Predictive Back] Don't hide/reveal scroll bar in predictive back swipe in 2 pane widget picker" into main

This commit is contained in:
Fengjiang Li
2024-03-08 22:04:06 +00:00
committed by Android (Google) Code Review
@@ -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) {