Merge "Clean up device profile change listeners for AllApps." into tm-qpr-dev (4500171c) · Commits · e / os / BlissLauncher3

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) {

+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);

+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;
		}