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

Commit d1726102 authored by Brian Isganitis's avatar Brian Isganitis
Browse files

Clean up device profile change listeners for AllApps. 

Test: https://b.corp.google.com/issues/260177372#comment1
Bug: 260177372
Change-Id: Ic7417980e8280bf2fcb110e5de74ea2ae59d9b74
parent d48a6fb4

quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java

+7 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ public class PredictionRowView<T extends Context & ActivityContext> 


        mFocusHelper = new SimpleFocusIndicatorHelper(this);

        mActivityContext = ActivityContext.lookupContext(context);

        mActivityContext.addOnDeviceProfileChangeListener(this);

        mNumPredictedAppsPerRow = mActivityContext.getDeviceProfile().numShownAllAppsColumns;

        updateVisibility();

    }
@@ -84,6 +83,13 @@ public class PredictionRowView<T extends Context & ActivityContext> 
    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        mActivityContext.addOnDeviceProfileChangeListener(this);

    }



    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        mActivityContext.removeOnDeviceProfileChangeListener(this);

    }



    public void setup(FloatingHeaderView parent, FloatingHeaderRow[] rows, boolean tabsHidden) {

quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java

+12 −1
Original line number Diff line number Diff line
@@ -112,12 +112,23 @@ public class TaskbarAllAppsSlideInView extends AbstractSlideInView<TaskbarOverla 
        DeviceProfile dp = mActivityContext.getDeviceProfile();

        setShiftRange(dp.allAppsShiftRange);



        mActivityContext.addOnDeviceProfileChangeListener(this);

        setContentBackgroundWithParent(

                getContext().getDrawable(R.drawable.bg_rounded_corner_bottom_sheet),

                mAppsView.getBottomSheetBackground());

    }



    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        mActivityContext.addOnDeviceProfileChangeListener(this);

    }



    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        mActivityContext.removeOnDeviceProfileChangeListener(this);

    }



    @Override

    protected void onScaleProgressChanged() {

        super.onScaleProgressChanged();

src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java

+12 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
                    onAppsUpdated);

        }

        mAllAppsStore.addUpdateListener(onAppsUpdated);

        mActivityContext.addOnDeviceProfileChangeListener(this);



        // This is a focus listener that proxies focus from a view into the list view.  This is to

        // work around the search box from getting first focus and showing the cursor.
@@ -263,6 +262,18 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
        mSearchUiManager.initializeSearch(this);

    }



    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        mActivityContext.addOnDeviceProfileChangeListener(this);

    }



    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        mActivityContext.removeOnDeviceProfileChangeListener(this);

    }



    public SearchUiManager getSearchUiManager() {

        return mSearchUiManager;

    }