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:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user