diff --git a/packages/SystemUI/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/res/values-sw600dp-land/dimens.xml index 1894b0c0266fb..117404bad46e6 100644 --- a/packages/SystemUI/res/values-sw600dp-land/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp-land/dimens.xml @@ -62,8 +62,9 @@ @dimen/lockscreen_shade_full_transition_distance - @dimen/lockscreen_shade_full_transition_distance + change. + On split-shade, there should be no depth effect, so setting the value to 0. --> + 0dp diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt index 263463050d41c..5adb9e55a9df6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt @@ -424,8 +424,11 @@ class LockscreenShadeTransitionController @Inject constructor( MathUtils.saturate(dragDownAmount / npvcKeyguardContentAlphaTransitionDistance) notificationPanelController.setKeyguardOnlyContentAlpha(1.0f - npvcProgress) - val depthProgress = MathUtils.saturate(dragDownAmount / depthControllerTransitionDistance) - depthController.transitionToFullShadeProgress = depthProgress + if (depthControllerTransitionDistance > 0) { + val depthProgress = + MathUtils.saturate(dragDownAmount / depthControllerTransitionDistance) + depthController.transitionToFullShadeProgress = depthProgress + } val udfpsProgress = MathUtils.saturate(dragDownAmount / udfpsTransitionDistance) udfpsKeyguardViewController?.setTransitionToFullShadeProgress(udfpsProgress)