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

Commit 7cc82d83 authored by Florence Yang's avatar Florence Yang
Browse files

Fix QS squishiness on LS shade transition 

QS tiles much smaller when pulling down shade on LS compared to same
gesture on Launcher. This is because the squishiness fraction is set
differently for LS and Launcher. So, the solution is to make sure the LS
squishiness fraction is in the same range as the Launcher's, so the QS
tiles are the same size on both interfaces.

Test: manual and atest qsSquishTransitionFraction_noStartDelay_startFractionSet_returnsBasedOnStartAndDistance, qsSquishTransitionFraction_startDelay_startFractionSet_basedOnStartAndDistanceAndDelay
Fixes: 243258790
Change-Id: I20f2a9829a972668021a3cff2b2673f2b6967928
parent de2e7c43

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

+0 −2
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ 
    <dimen name="lockscreen_shade_qs_transition_distance">@dimen/lockscreen_shade_notifications_scrim_transition_distance</dimen>

    <dimen name="lockscreen_shade_qs_transition_delay">@dimen/lockscreen_shade_notifications_scrim_transition_delay</dimen>

    <dimen name="lockscreen_shade_qs_squish_transition_distance">@dimen/lockscreen_shade_qs_transition_distance</dimen>

    <!-- On split-shade, the QS squish transition should start from half height.  -->

    <item name="lockscreen_shade_qs_squish_start_fraction" type="dimen" format="float" >0.5</item>

    <!-- 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>

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

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

+0 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ 
    <dimen name="lockscreen_shade_qs_transition_distance">@dimen/lockscreen_shade_full_transition_distance</dimen>

    <dimen name="lockscreen_shade_qs_transition_delay">@dimen/lockscreen_shade_scrim_transition_distance</dimen>

    <dimen name="lockscreen_shade_qs_squish_transition_distance">@dimen/lockscreen_shade_qs_transition_distance</dimen>

    <!-- On large screen portrait, the QS squish transition should start from half height.  -->

    <item name="lockscreen_shade_qs_squish_start_fraction" type="dimen" format="float" >0.5</item>

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

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

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

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -1221,7 +1221,7 @@ 


    <!-- The fraction at which the QS "squish" transition should start during the lockscreen shade

         expansion. 0 is fully collapsed, 1 is fully expanded. -->

    <item type="dimen" format="float" name="lockscreen_shade_qs_squish_start_fraction">0</item>

    <item type="dimen" format="float" name="lockscreen_shade_qs_squish_start_fraction">0.5</item>



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

         change.  -->