Merge "Refctor DisplayController#handleInfoChange" into main (d3460af4) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -253,7 +253,7 @@ public class DesktopVisibilityController {
		for (DesktopVisibilityListener listener : mDesktopVisibilityListeners) {
		listener.onDesktopVisibilityChanged(areDesktopTasksVisible);
		}
		DisplayController.handleInfoChangeForDesktopMode(mContext);
		DisplayController.INSTANCE.get(mContext).notifyConfigChange();
		}

		private void notifyTaskbarDesktopModeListeners(boolean doesAnyTaskRequireTaskbarRounding) {

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -213,7 +213,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
		@Override
		public void onLauncherVisibilityChanged(boolean isVisible) {
		if (DesktopModeStatus.enterDesktopByDefaultOnFreeformDisplay(mLauncher)) {
		DisplayController.handleInfoChangeForLauncherVisibilityChanged(mLauncher);
		DisplayController.INSTANCE.get(mLauncher).notifyConfigChange();
		}
		onLauncherVisibilityChanged(isVisible, false /* fromInit */);
		}

src/com/android/launcher3/util/DisplayController.java

+4 −19

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable {
		&& mInfo.mIsTaskbarPinnedInDesktopMode != prefs.get(
		TASKBAR_PINNING_IN_DESKTOP_MODE);
		if (isTaskbarPinningChanged \|\| isTaskbarPinningDesktopModeChanged) {
		handleInfoChange();
		notifyConfigChange();
		}
		};

		@@ -178,20 +178,6 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable {
		return INSTANCE.get(context).getInfo().isTransientTaskbar();
		}

		/**
		* Handles info change for desktop mode.
		*/
		public static void handleInfoChangeForDesktopMode(Context context) {
		INSTANCE.get(context).handleInfoChange();
		}

		/**
		* Handles info change for launcher visibility.
		*/
		public static void handleInfoChangeForLauncherVisibilityChanged(Context context) {
		INSTANCE.get(context).handleInfoChange();
		}

		/**
		* Enables transient taskbar status for tests.
		*/
		@@ -259,7 +245,7 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable {
		}
		if (ACTION_OVERLAY_CHANGED.equals(intent.getAction())) {
		Log.d(TAG, "Overlay changed, notifying listeners");
		handleInfoChange();
		notifyConfigChange();
		}
		}

		@@ -272,7 +258,7 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable {
		\|\| !mInfo.mScreenSizeDp.equals(
		new PortraitSize(config.screenHeightDp, config.screenWidthDp))
		\|\| mWindowContext.getDisplay().getRotation() != mInfo.rotation) {
		handleInfoChange();
		notifyConfigChange();
		}
		}

		@@ -296,8 +282,7 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable {
		}

		@AnyThread
		@VisibleForTesting
		public void handleInfoChange() {
		public void notifyConfigChange() {
		WindowManagerProxy wmProxy = WindowManagerProxy.INSTANCE.get(mContext);
		Info oldInfo = mInfo;

tests/multivalentTests/src/com/android/launcher3/util/DisplayControllerTest.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -178,7 +178,7 @@ class DisplayControllerTest {
		@UiThreadTest
		fun testTaskbarPinning() {
		whenever(launcherPrefs.get(TASKBAR_PINNING)).thenReturn(true)
		displayController.handleInfoChange()
		displayController.notifyConfigChange()
		verify(displayInfoChangeListener)
		.onDisplayInfoChanged(any(), any(), eq(CHANGE_TASKBAR_PINNING))
		}
		@@ -187,7 +187,7 @@ class DisplayControllerTest {
		@UiThreadTest
		fun testTaskbarPinningChangeInDesktopMode() {
		whenever(launcherPrefs.get(TASKBAR_PINNING_IN_DESKTOP_MODE)).thenReturn(false)
		displayController.handleInfoChange()
		displayController.notifyConfigChange()
		verify(displayInfoChangeListener)
		.onDisplayInfoChanged(any(), any(), eq(CHANGE_TASKBAR_PINNING))
		}
		@@ -202,7 +202,7 @@ class DisplayControllerTest {
		DisplayController.enableTaskbarModePreferenceForTests(true)

		assertTrue(displayController.getInfo().isTransientTaskbar())
		displayController.handleInfoChange()
		displayController.notifyConfigChange()
		verify(displayInfoChangeListener)
		.onDisplayInfoChanged(any(), any(), eq(CHANGE_TASKBAR_PINNING))
		assertFalse(displayController.getInfo().isTransientTaskbar())