Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5eb5b95b authored by Nikki Moteva's avatar Nikki Moteva Committed by Android (Google) Code Review
Browse files

Merge changes I770cb245,I035bb8c2 into main 

* changes:
  Settings: make scroll bar not visible while changing a setting.
  Settings: show scrollbar only when user is scrolling.
parents bb3f508f 7d2cf7aa

src/com/android/settings/core/InstrumentedPreferenceFragment.java

+7 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc 
        if (recyclerView != null) {

            mOnScrollListener = new OnScrollListener(getClass().getName());

            recyclerView.addOnScrollListener(mOnScrollListener);



            // Scrollbar should only be visible when the user is scrolling.

            recyclerView.setVerticalScrollBarEnabled(false);

        }

        super.onResume();

    }
@@ -153,9 +156,13 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc 
                            Configuration.Builder.withView(CUJ_SETTINGS_PAGE_SCROLL, recyclerView)

                                    .setTag(mClassName);

                    mMonitor.begin(builder);

                    recyclerView.setVerticalScrollBarEnabled(true);

                    break;

                case RecyclerView.SCROLL_STATE_IDLE:

                    mMonitor.end(CUJ_SETTINGS_PAGE_SCROLL);

                    // Disable scrollbar when the user is not scrolling. This is to avoid the

                    // scrollbar from being visible when the user is changing a setting.

                    recyclerView.setVerticalScrollBarEnabled(false);

                    break;

                default:

            }