Merge "Remove unused method in NotificationShadeDepthController.DepthListener" into main (ef3feb51) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt

+0 −3

Original line number	Diff line number	Diff line
		@@ -353,7 +353,6 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() {
		notificationShadeDepthController.addListener(listener)
		notificationShadeDepthController.updateBlurCallback.doFrame(0)
		verify(wallpaperController).setNotificationShadeZoom(anyFloat())
		verify(listener).onWallpaperZoomOutChanged(anyFloat())
		verify(blurUtils).applyBlur(any(), anyInt(), eq(false))
		}

		@@ -369,7 +368,6 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() {
		notificationShadeDepthController.updateBlurCallback.doFrame(0)

		verify(wallpaperController).setNotificationShadeZoom(eq(0f))
		verify(listener).onWallpaperZoomOutChanged(eq(0f))
		}

		@Test
		@@ -384,7 +382,6 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() {
		notificationShadeDepthController.updateBlurCallback.doFrame(0)

		verify(wallpaperController).setNotificationShadeZoom(floatThat { it != 0f })
		verify(listener).onWallpaperZoomOutChanged(floatThat { it != 0f })
		}

		@Test

+0 −4

Original line number	Diff line number	Diff line
		@@ -501,10 +501,6 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
		new NotificationShadeDepthController.DepthListener() {
		boolean mHasBlurs;

		@Override
		public void onWallpaperZoomOutChanged(float zoomOut) {
		}

		@Override
		public void onBlurRadiusChanged(int radius) {
		boolean hasBlurs = radius != 0;

+0 −4

Original line number	Diff line number	Diff line
		@@ -342,7 +342,6 @@ constructor(
		keyguardInteractor.setZoomOut(zoomOutFromShadeRadius)
		}
		listeners.forEach {
		it.onWallpaperZoomOutChanged(zoomOutFromShadeRadius)
		it.onBlurRadiusChanged(appliedBlurRadius)
		}
		notificationShadeWindowController.setBackgroundBlurRadius(appliedBlurRadius)
		@@ -761,9 +760,6 @@ constructor(

		/** Invoked when changes are needed in z-space */
		interface DepthListener {
		/** Current wallpaper zoom out, where 0 is the closest, and 1 the farthest */
		fun onWallpaperZoomOutChanged(zoomOut: Float)

		fun onBlurRadiusChanged(blurRadius: Int) {}
		}
		}