Merge "Handle display windowing mode change in onConfigChanged" into main (c6b29e37) · Commits · e / os / BlissLauncher3

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -255,7 +255,9 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable {
		\|\| config.fontScale != mInfo.fontScale
		\|\| !mInfo.mScreenSizeDp.equals(
		new PortraitSize(config.screenHeightDp, config.screenWidthDp))
		\|\| mWindowContext.getDisplay().getRotation() != mInfo.rotation) {
		\|\| mWindowContext.getDisplay().getRotation() != mInfo.rotation
		\|\| WindowManagerProxy.INSTANCE.get(mContext).showLockedTaskbarOnHome(mWindowContext)
		!= mInfo.showLockedTaskbarOnHome()) {
		notifyConfigChange();
		}
		}

+17 −0

Original line number	Diff line number	Diff line
		@@ -207,4 +207,21 @@ class DisplayControllerTest {
		.onDisplayInfoChanged(any(), any(), eq(CHANGE_TASKBAR_PINNING))
		assertFalse(displayController.getInfo().isTransientTaskbar())
		}

		@Test
		@UiThreadTest
		fun testLockedTaskbarChangeOnConfigurationChanged() {
		whenever(windowManagerProxy.showLockedTaskbarOnHome(any())).thenReturn(true)
		whenever(windowManagerProxy.isHomeVisible(any())).thenReturn(true)
		whenever(windowManagerProxy.isInDesktopMode()).thenReturn(false)
		whenever(launcherPrefs.get(TASKBAR_PINNING)).thenReturn(false)
		DisplayController.enableTaskbarModePreferenceForTests(true)
		assertTrue(displayController.getInfo().isTransientTaskbar())

		displayController.onConfigurationChanged(configuration)

		verify(displayInfoChangeListener)
		.onDisplayInfoChanged(any(), any(), eq(CHANGE_TASKBAR_PINNING))
		assertFalse(displayController.getInfo().isTransientTaskbar())
		}
		}