Ahmed Fakhry
ad6fee6111
This CL does the following: - Adds new methods `isInDesktopMode()` and `isInDesktopModeAndNotInOverview()` to `DesktopVisibilityController`. - These two methods rely on the new multi-desks impl when the flags are enabled. - Makes the existing `areDesktopTasksVisible()` and `areDesktopTasksVisibleAndNotInOverview()` private, and migrates all the usages to the new methods. - The new methods uses the old methods if the flags are disabled. A companion NexusLauncher CL is at ag/31601363. Bug: 394182435 Test: m Flag: com.android.window.flags.enable_multiple_desktops_frontend Flag: com.android.window.flags.enable_multiple_desktops_backend Change-Id: I29ff38f984bfe2f68a120f84e1a75fa36b739258
307 lines
13 KiB
Kotlin
307 lines
13 KiB
Kotlin
/*
|
|
* Copyright (C) 2023 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package com.android.launcher3.util
|
|
|
|
import android.content.res.Configuration
|
|
import android.content.res.Resources
|
|
import android.graphics.Point
|
|
import android.graphics.Rect
|
|
import android.hardware.display.DisplayManager
|
|
import android.util.ArrayMap
|
|
import android.util.DisplayMetrics
|
|
import android.view.Display
|
|
import android.view.Surface
|
|
import androidx.test.annotation.UiThreadTest
|
|
import androidx.test.filters.SmallTest
|
|
import com.android.launcher3.LauncherPrefs
|
|
import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING
|
|
import com.android.launcher3.LauncherPrefs.Companion.TASKBAR_PINNING_IN_DESKTOP_MODE
|
|
import com.android.launcher3.dagger.LauncherAppComponent
|
|
import com.android.launcher3.dagger.LauncherAppSingleton
|
|
import com.android.launcher3.util.DisplayController.CHANGE_DENSITY
|
|
import com.android.launcher3.util.DisplayController.CHANGE_DESKTOP_MODE
|
|
import com.android.launcher3.util.DisplayController.CHANGE_ROTATION
|
|
import com.android.launcher3.util.DisplayController.CHANGE_TASKBAR_PINNING
|
|
import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener
|
|
import com.android.launcher3.util.LauncherModelHelper.SandboxModelContext
|
|
import com.android.launcher3.util.window.CachedDisplayInfo
|
|
import com.android.launcher3.util.window.WindowManagerProxy
|
|
import dagger.BindsInstance
|
|
import dagger.Component
|
|
import junit.framework.Assert.assertFalse
|
|
import junit.framework.Assert.assertTrue
|
|
import kotlin.math.min
|
|
import org.junit.After
|
|
import org.junit.Before
|
|
import org.junit.Test
|
|
import org.junit.runner.RunWith
|
|
import org.mockito.kotlin.any
|
|
import org.mockito.kotlin.anyOrNull
|
|
import org.mockito.kotlin.doNothing
|
|
import org.mockito.kotlin.doReturn
|
|
import org.mockito.kotlin.eq
|
|
import org.mockito.kotlin.mock
|
|
import org.mockito.kotlin.spy
|
|
import org.mockito.kotlin.verify
|
|
import org.mockito.kotlin.whenever
|
|
import org.mockito.stubbing.Answer
|
|
|
|
/** Unit tests for {@link DisplayController} */
|
|
@SmallTest
|
|
@RunWith(LauncherMultivalentJUnit::class)
|
|
class DisplayControllerTest {
|
|
|
|
private val context = spy(SandboxModelContext())
|
|
private val windowManagerProxy: MyWmProxy = mock()
|
|
private val launcherPrefs: LauncherPrefs = mock()
|
|
private lateinit var displayManager: DisplayManager
|
|
private val display: Display = mock()
|
|
private val resources: Resources = mock()
|
|
private val displayInfoChangeListener: DisplayInfoChangeListener = mock()
|
|
|
|
private lateinit var displayController: DisplayController
|
|
|
|
private val width = 2208
|
|
private val height = 1840
|
|
private val inset = 110
|
|
private val densityDpi = 420
|
|
private val density = densityDpi / DisplayMetrics.DENSITY_DEFAULT.toFloat()
|
|
private val bounds =
|
|
arrayOf(
|
|
WindowBounds(Rect(0, 0, width, height), Rect(0, inset, 0, 0), Surface.ROTATION_0),
|
|
WindowBounds(Rect(0, 0, height, width), Rect(0, inset, 0, 0), Surface.ROTATION_90),
|
|
WindowBounds(Rect(0, 0, width, height), Rect(0, inset, 0, 0), Surface.ROTATION_180),
|
|
WindowBounds(Rect(0, 0, height, width), Rect(0, inset, 0, 0), Surface.ROTATION_270),
|
|
)
|
|
private val configuration =
|
|
Configuration(context.resources.configuration).apply {
|
|
densityDpi = this@DisplayControllerTest.densityDpi
|
|
screenWidthDp = (bounds[0].bounds.width() / density).toInt()
|
|
screenHeightDp = (bounds[0].bounds.height() / density).toInt()
|
|
smallestScreenWidthDp = min(screenWidthDp, screenHeightDp)
|
|
}
|
|
|
|
@Before
|
|
fun setUp() {
|
|
context.initDaggerComponent(
|
|
DaggerDisplayControllerTestComponent.builder()
|
|
.bindWMProxy(windowManagerProxy)
|
|
.bindLauncherPrefs(launcherPrefs)
|
|
)
|
|
displayManager = context.spyService(DisplayManager::class.java)
|
|
|
|
whenever(launcherPrefs.get(TASKBAR_PINNING)).thenReturn(false)
|
|
whenever(launcherPrefs.get(TASKBAR_PINNING_IN_DESKTOP_MODE)).thenReturn(true)
|
|
|
|
// Mock WindowManagerProxy
|
|
val displayInfo = CachedDisplayInfo(Point(width, height), Surface.ROTATION_0)
|
|
whenever(windowManagerProxy.getDisplayInfo(any())).thenReturn(displayInfo)
|
|
whenever(windowManagerProxy.estimateInternalDisplayBounds(any()))
|
|
.thenAnswer(
|
|
Answer {
|
|
// Always create a new copy of bounds
|
|
val perDisplayBounds = ArrayMap<CachedDisplayInfo, List<WindowBounds>>()
|
|
perDisplayBounds[displayInfo] = bounds.toList()
|
|
return@Answer perDisplayBounds
|
|
}
|
|
)
|
|
whenever(windowManagerProxy.getRealBounds(any(), any())).thenAnswer { i ->
|
|
bounds[i.getArgument<CachedDisplayInfo>(1).rotation]
|
|
}
|
|
whenever(windowManagerProxy.showLockedTaskbarOnHome(any())).thenReturn(false)
|
|
|
|
whenever(windowManagerProxy.getNavigationMode(any())).thenReturn(NavigationMode.NO_BUTTON)
|
|
// Mock context
|
|
doReturn(context).whenever(context).createWindowContext(any(), any(), anyOrNull())
|
|
doNothing().whenever(context).registerComponentCallbacks(any())
|
|
|
|
// Mock display
|
|
whenever(display.rotation).thenReturn(displayInfo.rotation)
|
|
doReturn(display).whenever(context).display
|
|
doReturn(display).whenever(displayManager).getDisplay(any())
|
|
|
|
// Mock resources
|
|
doReturn(context).whenever(context).applicationContext
|
|
whenever(resources.configuration).thenReturn(configuration)
|
|
whenever(context.resources).thenReturn(resources)
|
|
|
|
// Initialize DisplayController
|
|
displayController = DisplayController.INSTANCE.get(context)
|
|
displayController.addChangeListener(displayInfoChangeListener)
|
|
}
|
|
|
|
@After
|
|
fun tearDown() {
|
|
// We need to reset the taskbar mode preference override even if a test throws an exception.
|
|
// Otherwise, it may break the following tests' assumptions.
|
|
DisplayController.enableTaskbarModePreferenceForTests(false)
|
|
context.onDestroy()
|
|
}
|
|
|
|
@Test
|
|
@UiThreadTest
|
|
fun testRotation() {
|
|
val displayInfo = CachedDisplayInfo(Point(height, width), Surface.ROTATION_90)
|
|
whenever(windowManagerProxy.getDisplayInfo(any())).thenReturn(displayInfo)
|
|
whenever(display.rotation).thenReturn(displayInfo.rotation)
|
|
val configuration =
|
|
Configuration(configuration).apply {
|
|
screenWidthDp = configuration.screenHeightDp
|
|
screenHeightDp = configuration.screenWidthDp
|
|
}
|
|
whenever(resources.configuration).thenReturn(configuration)
|
|
|
|
displayController.onConfigurationChanged(configuration)
|
|
|
|
verify(displayInfoChangeListener).onDisplayInfoChanged(any(), any(), eq(CHANGE_ROTATION))
|
|
}
|
|
|
|
@Test
|
|
@UiThreadTest
|
|
fun testFontScale() {
|
|
val configuration = Configuration(configuration).apply { fontScale = 1.2f }
|
|
whenever(resources.configuration).thenReturn(configuration)
|
|
|
|
displayController.onConfigurationChanged(configuration)
|
|
|
|
verify(displayInfoChangeListener).onDisplayInfoChanged(any(), any(), eq(CHANGE_DENSITY))
|
|
}
|
|
|
|
@Test
|
|
@UiThreadTest
|
|
fun testTaskbarPinning() {
|
|
whenever(launcherPrefs.get(TASKBAR_PINNING)).thenReturn(true)
|
|
displayController.notifyConfigChange()
|
|
verify(displayInfoChangeListener)
|
|
.onDisplayInfoChanged(any(), any(), eq(CHANGE_TASKBAR_PINNING))
|
|
}
|
|
|
|
@Test
|
|
@UiThreadTest
|
|
fun testTaskbarPinningChangeInDesktopMode() {
|
|
whenever(launcherPrefs.get(TASKBAR_PINNING_IN_DESKTOP_MODE)).thenReturn(false)
|
|
displayController.notifyConfigChange()
|
|
verify(displayInfoChangeListener)
|
|
.onDisplayInfoChanged(any(), any(), eq(CHANGE_TASKBAR_PINNING))
|
|
}
|
|
|
|
@Test
|
|
@UiThreadTest
|
|
fun testTaskbarPinningChangeInLockedTaskbarChange() {
|
|
whenever(windowManagerProxy.showLockedTaskbarOnHome(any())).thenReturn(true)
|
|
whenever(windowManagerProxy.isHomeVisible(any())).thenReturn(true)
|
|
whenever(windowManagerProxy.isInDesktopMode(any())).thenReturn(false)
|
|
whenever(launcherPrefs.get(TASKBAR_PINNING)).thenReturn(false)
|
|
DisplayController.enableTaskbarModePreferenceForTests(true)
|
|
|
|
assertTrue(displayController.getInfo().isTransientTaskbar())
|
|
displayController.notifyConfigChange()
|
|
verify(displayInfoChangeListener)
|
|
.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(any())).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())
|
|
}
|
|
|
|
@Test
|
|
@UiThreadTest
|
|
fun testTaskbarPinnedForDesktopTaskbar_inDesktopMode() {
|
|
whenever(windowManagerProxy.showDesktopTaskbarForFreeformDisplay(any())).thenReturn(true)
|
|
whenever(launcherPrefs.get(TASKBAR_PINNING)).thenReturn(false)
|
|
whenever(launcherPrefs.get(TASKBAR_PINNING_IN_DESKTOP_MODE)).thenReturn(false)
|
|
whenever(windowManagerProxy.isInDesktopMode(any())).thenReturn(true)
|
|
whenever(windowManagerProxy.isHomeVisible(any())).thenReturn(false)
|
|
DisplayController.enableTaskbarModePreferenceForTests(true)
|
|
|
|
assertTrue(displayController.getInfo().isTransientTaskbar())
|
|
|
|
displayController.onConfigurationChanged(configuration)
|
|
|
|
verify(displayInfoChangeListener)
|
|
.onDisplayInfoChanged(any(), any(), eq(CHANGE_TASKBAR_PINNING or CHANGE_DESKTOP_MODE))
|
|
assertFalse(displayController.getInfo().isTransientTaskbar())
|
|
}
|
|
|
|
@Test
|
|
@UiThreadTest
|
|
fun testTaskbarPinnedForDesktopTaskbar_notInDesktopMode() {
|
|
whenever(windowManagerProxy.showDesktopTaskbarForFreeformDisplay(any())).thenReturn(true)
|
|
whenever(launcherPrefs.get(TASKBAR_PINNING)).thenReturn(false)
|
|
whenever(launcherPrefs.get(TASKBAR_PINNING_IN_DESKTOP_MODE)).thenReturn(false)
|
|
whenever(windowManagerProxy.isInDesktopMode(any())).thenReturn(false)
|
|
whenever(windowManagerProxy.isHomeVisible(any())).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())
|
|
}
|
|
|
|
@Test
|
|
@UiThreadTest
|
|
fun testTaskbarPinnedForDesktopTaskbar_onHome() {
|
|
whenever(windowManagerProxy.showDesktopTaskbarForFreeformDisplay(any())).thenReturn(true)
|
|
whenever(launcherPrefs.get(TASKBAR_PINNING)).thenReturn(false)
|
|
whenever(launcherPrefs.get(TASKBAR_PINNING_IN_DESKTOP_MODE)).thenReturn(false)
|
|
whenever(windowManagerProxy.isInDesktopMode(any())).thenReturn(false)
|
|
whenever(windowManagerProxy.isHomeVisible(any())).thenReturn(true)
|
|
DisplayController.enableTaskbarModePreferenceForTests(true)
|
|
|
|
assertTrue(displayController.getInfo().isTransientTaskbar())
|
|
|
|
displayController.onConfigurationChanged(configuration)
|
|
|
|
verify(displayInfoChangeListener)
|
|
.onDisplayInfoChanged(any(), any(), eq(CHANGE_TASKBAR_PINNING))
|
|
assertFalse(displayController.getInfo().isTransientTaskbar())
|
|
}
|
|
}
|
|
|
|
class MyWmProxy : WindowManagerProxy()
|
|
|
|
@LauncherAppSingleton
|
|
@Component(modules = [AllModulesMinusWMProxy::class])
|
|
interface DisplayControllerTestComponent : LauncherAppComponent {
|
|
|
|
@Component.Builder
|
|
interface Builder : LauncherAppComponent.Builder {
|
|
@BindsInstance fun bindWMProxy(proxy: WindowManagerProxy): Builder
|
|
|
|
@BindsInstance fun bindLauncherPrefs(prefs: LauncherPrefs): Builder
|
|
|
|
override fun build(): DisplayControllerTestComponent
|
|
}
|
|
}
|