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

Commit 7ed32025 authored by Alina Zaidi's avatar Alina Zaidi Committed by Android (Google) Code Review
Browse files

Merge "Make sure search recycler view is bound to fast scroller if user is in... 

Merge "Make sure search recycler view is bound to fast scroller if user is in search mode at the time of attachment of work/personal recycler view." into sc-dev
parents 8fb6ca3e 57973c32

src/com/android/launcher3/widget/picker/WidgetsFullSheet.java

+28 −0
Original line number Diff line number Diff line
@@ -129,6 +129,22 @@ public class WidgetsFullSheet extends BaseWidgetSheet 
        }

    };



    private final OnAttachStateChangeListener mBindScrollbarInSearchMode =

            new OnAttachStateChangeListener() {

                @Override

                public void onViewAttachedToWindow(View view) {

                    WidgetsRecyclerView searchRecyclerView =

                            mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView;

                    if (mIsInSearchMode && searchRecyclerView != null) {

                        searchRecyclerView.bindFastScrollbar();

                    }

                }



                @Override

                public void onViewDetachedFromWindow(View view) {

                }

            };



    private final int mTabsHeight;

    private final int mViewPagerTopPadding;

    private final int mSearchAndRecommendationContainerBottomMargin;
@@ -303,6 +319,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet 
    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        mActivityContext.getAppWidgetHost().removeProviderChangeListener(this);

        mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView

                .removeOnAttachStateChangeListener(mBindScrollbarInSearchMode);

        if (mHasWorkProfile) {

            mAdapters.get(AdapterHolder.WORK).mWidgetsRecyclerView

                    .removeOnAttachStateChangeListener(mBindScrollbarInSearchMode);

        }

    }



    @Override
@@ -752,6 +774,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet 
            mWidgetsRecyclerView.setHeaderViewDimensionsProvider(WidgetsFullSheet.this);

            mWidgetsRecyclerView.setEdgeEffectFactory(

                    ((TopRoundedCornerView) mContent).createEdgeEffectFactory());

            // Recycler view binds to fast scroller when it is attached to screen. Make sure

            // search recycler view is bound to fast scroller if user is in search mode at the time

            // of attachment.

            if (mAdapterType == PRIMARY || mAdapterType == WORK) {

                mWidgetsRecyclerView.addOnAttachStateChangeListener(mBindScrollbarInSearchMode);

            }

            mWidgetsListAdapter.setApplyBitmapDeferred(false, mWidgetsRecyclerView);

            mWidgetsListAdapter.setMaxHorizontalSpansPerRow(mMaxSpansPerRow);

        }