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

Commit 7d8b81df authored by Brian Isganitis's avatar Brian Isganitis Committed by Automerger Merge Worker
Browse files

Merge "Clean up device profile change listeners for AllApps." into tm-qpr-dev am: 4500171c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22338655



Change-Id: I54c6fb31077ed06f6e0122dca3e47e3a7e6f8f34
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 552fe5ec 4500171c

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

+10 −0
Original line number Diff line number Diff line
@@ -99,10 +99,20 @@ public class TaskbarAllAppsSlideInView extends AbstractSlideInView<TaskbarOverla 


        DeviceProfile dp = mActivityContext.getDeviceProfile();

        setShiftRange(dp.allAppsShiftRange);

    }



    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        mActivityContext.addOnDeviceProfileChangeListener(this);

    }



    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        mActivityContext.removeOnDeviceProfileChangeListener(this);

    }



    @Override

    protected void onLayout(boolean changed, int l, int t, int r, int b) {

        super.onLayout(changed, l, t, r, b);

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

+12 −1
Original line number Diff line number Diff line
@@ -191,7 +191,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.
@@ -262,6 +261,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;

    }