Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea50684c authored by Christian Göllner's avatar Christian Göllner
Browse files

[Motion] Split-shade expansion on LS: disable depth effect 

Disables the depth change effect of the wallpaper when expanding
the shade, to match the motion spec for T.

Fixes: 222282930
Test: Manually
Change-Id: Ifbcbec9a6cd37154c728b07db61bd507c4ec1351
parent 183b053b

packages/SystemUI/res/values-sw600dp-land/dimens.xml

+3 −2
Original line number Diff line number Diff line
@@ -62,8 +62,9 @@ 
    <dimen name="lockscreen_shade_qs_transition_distance">@dimen/lockscreen_shade_full_transition_distance</dimen>



    <!-- Distance that the full shade transition takes in order for depth of the wallpaper to fully

         change.  -->

    <dimen name="lockscreen_shade_depth_controller_transition_distance">@dimen/lockscreen_shade_full_transition_distance</dimen>

         change.

         On split-shade, there should be no depth effect, so setting the value to 0. -->

    <dimen name="lockscreen_shade_depth_controller_transition_distance">0dp</dimen>



    <!-- Distance that the full shade transition takes in order for the UDFPS Keyguard View to fully

         fade. -->

packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt

+5 −2
Original line number Diff line number Diff line
@@ -424,8 +424,11 @@ class LockscreenShadeTransitionController @Inject constructor( 
            MathUtils.saturate(dragDownAmount / npvcKeyguardContentAlphaTransitionDistance)

        notificationPanelController.setKeyguardOnlyContentAlpha(1.0f - npvcProgress)



        val depthProgress = MathUtils.saturate(dragDownAmount / depthControllerTransitionDistance)

        if (depthControllerTransitionDistance > 0) {

            val depthProgress =

                MathUtils.saturate(dragDownAmount / depthControllerTransitionDistance)

            depthController.transitionToFullShadeProgress = depthProgress

        }



        val udfpsProgress = MathUtils.saturate(dragDownAmount / udfpsTransitionDistance)

        udfpsKeyguardViewController?.setTransitionToFullShadeProgress(udfpsProgress)