Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wallpaper zoom regression

Browse Source 
Zooms should happen as well when blurs are disabled

Fixes: 192087101
Test: atest NotificationShadeDepthControllerTest
Change-Id: I1c869bfda19e157259f0b4f9c9cee01aab40e6e5
This commit is contained in:
Lucas Dupin
2021-06-25 10:08:53 -07:00
parent 598f0602e2
commit 6d3879525a
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt
View File

@@ -195,11 +195,15 @@ class NotificationShadeDepthController @Inject constructor(
var blur = max(shadeRadius.toInt(), globalActionsRadius)
// Make blur be 0 if it is necessary to stop blur effect.
if (scrimsVisible || !blurUtils.supportsBlursOnWindows()) {
if (scrimsVisible) {
blur = 0
}
val zoomOut = blurUtils.ratioOfBlurRadius(blur)
if (!blurUtils.supportsBlursOnWindows()) {
blur = 0
}
// Brightness slider removes blur, but doesn't affect zooms
blur = (blur * (1f - brightnessMirrorSpring.ratio)).toInt()

10
packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt
View File

@@ -200,9 +200,19 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() {
@Test
fun setFullShadeTransition_appliesBlur_onlyIfSupported() {
reset(blurUtils)
`when`(blurUtils.blurRadiusOfRatio(anyFloat())).then { answer ->
(answer.arguments[0] as Float * maxBlur).toInt()
}
`when`(blurUtils.ratioOfBlurRadius(anyInt())).then { answer ->
answer.arguments[0] as Int / maxBlur.toFloat()
}
`when`(blurUtils.maxBlurRadius).thenReturn(maxBlur)
`when`(blurUtils.maxBlurRadius).thenReturn(maxBlur)
notificationShadeDepthController.transitionToFullShadeProgress = 1f
notificationShadeDepthController.updateBlurCallback.doFrame(0)
verify(blurUtils).applyBlur(any(), eq(0), eq(false))
verify(wallpaperManager).setWallpaperZoomOut(any(), eq(1f))
}
@Test