Add functionality to DepthController to control wallpaper zoom indepedently of blur

Also add wallpaper zoom to folder motion

Bug: b/387543793
Flag: com.android.launcher3.enable_expressive_folder_expansion
Test: manually and DepthControllerTest
Change-Id: I94142806ffb6dfb93d363017ef4d13b3a5e74681
This commit is contained in:
Charlie Anderson authored and Pun Butrach committed 2026-10-26 00:08:46 +07:00
1 parent 0d40f78616
commit e9c655dbf6
8 files changed
+200 -16

No files matched your search

@@ -16,35 +16,47 @@
package com.android.launcher3.statehandlers
import android.app.WallpaperManager
import android.content.res.Resources
import android.os.IBinder
import android.platform.test.annotations.DisableFlags
import android.platform.test.annotations.EnableFlags
import android.platform.test.flag.junit.SetFlagsRule
import android.view.ViewTreeObserver
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest
import com.android.launcher3.Flags
import com.android.launcher3.Flags.FLAG_ENABLE_EXPRESSIVE_FOLDER_EXPANSION
import com.android.launcher3.Launcher
import com.android.launcher3.LauncherRootView
import com.android.launcher3.LauncherState
import com.android.launcher3.R
import com.android.launcher3.dragndrop.DragLayer
import com.android.launcher3.statemanager.StateManager
import com.android.launcher3.uioverrides.QuickstepLauncher
import java.util.Collections
import com.android.launcher3.views.ScrimView
import junit.framework.TestCase.assertFalse
import junit.framework.TestCase.assertNull
import junit.framework.TestCase.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.ArgumentMatchers.anyFloat
import org.mockito.Mock
import org.mockito.Mockito.atLeastOnce
import org.mockito.Mockito.reset
import org.mockito.Mockito.same
import org.mockito.Mockito.verify
import org.mockito.Mockito.verifyNoMoreInteractions
import org.mockito.Mockito.`when`
import org.mockito.MockitoAnnotations
import org.mockito.junit.MockitoJUnit
import org.mockito.kotlin.any
import java.util.Collections
@SmallTest
@RunWith(AndroidJUnit4::class)
class DepthControllerTest {
@get:Rule(order = 0) val setFlagsRule = SetFlagsRule()
private lateinit var underTest: DepthController
@Mock private lateinit var launcher: QuickstepLauncher
@@ -52,6 +64,10 @@ class DepthControllerTest {
@Mock private lateinit var resource: Resources
@Mock private lateinit var dragLayer: DragLayer
@Mock private lateinit var viewTreeObserver: ViewTreeObserver
@Mock private lateinit var wallpaperManager: WallpaperManager
@Mock private lateinit var rootView: LauncherRootView
@Mock private lateinit var windowToken: IBinder
@Mock private lateinit var scrimView: ScrimView
@Before
fun setUp() {
@@ -62,6 +78,13 @@ class DepthControllerTest {
`when`(dragLayer.viewTreeObserver).thenReturn(viewTreeObserver)
`when`(launcher.stateManager).thenReturn(stateManager)
`when`(launcher.depthBlurTargets).thenReturn(Collections.emptyList())
`when`(launcher.getSystemService(WallpaperManager::class.java)).thenReturn(wallpaperManager)
`when`(wallpaperManager.setWallpaperZoomOut(any(), anyFloat())).then {
// do nothing
}
`when`(launcher.rootView).thenReturn(rootView)
`when`(rootView.windowToken).thenReturn(windowToken)
`when`(launcher.scrimView).thenReturn(scrimView)
underTest = DepthController(launcher)
}
@@ -205,4 +228,43 @@ class DepthControllerTest {
`when`(stateManager.targetState).thenReturn(LauncherState.OVERVIEW)
assertFalse(underTest.blurWorkspaceDepthTargets())
}
@Test
@DisableFlags(FLAG_ENABLE_EXPRESSIVE_FOLDER_EXPANSION)
fun whenExpressiveFolderExpansionFalse_onlySetDepth() {
`when`(stateManager.state).thenReturn(LauncherState.NORMAL)
assertNull(underTest.folderZoom)
underTest.stateDepth.value = 1f
verify(wallpaperManager).setWallpaperZoomOut(windowToken, 1f)
}
@Test
@EnableFlags(FLAG_ENABLE_EXPRESSIVE_FOLDER_EXPANSION)
fun wallpaperZoom_setsWallpaperZoom() {
val zoom = 0.75f
underTest.folderZoom.value = zoom
verify(wallpaperManager).setWallpaperZoomOut(windowToken, zoom)
}
@Test
@EnableFlags(FLAG_ENABLE_EXPRESSIVE_FOLDER_EXPANSION)
fun wallpaperZoom_andStateDepth_setsMaxWallpaperZoom() {
`when`(stateManager.state).thenReturn(LauncherState.NORMAL)
val folderZoom = 0.8f
val stateDepth = 0.5f
underTest.stateDepth.value = stateDepth
underTest.folderZoom.value = folderZoom
// wallpaperZoom should be max of folderZoom and stateDepth
verify(wallpaperManager, atLeastOnce()).setWallpaperZoomOut(windowToken, folderZoom)
reset(wallpaperManager)
val folderZoom2 = 0.6f
val stateDepth2 = 1f
underTest.folderZoom.value = folderZoom2
underTest.stateDepth.value = stateDepth2
verify(wallpaperManager, atLeastOnce()).setWallpaperZoomOut(windowToken, stateDepth2)
}
}