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

Commit ce24d498 authored by Florence Yang's avatar Florence Yang Committed by Automerger Merge Worker
Browse files

Merge "Fix QS squishiness on LS shade transition" into tm-qpr-dev am: 3f9d7e2f am: 821e9b6b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19957177



Change-Id: I80c7209b2799ec3b4016f8a1aa15dd19abf2b748
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c2047a6 821e9b6b

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
@@ -1235,7 +1235,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.  -->