Merge "Fix QS squishiness on LS shade transition" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
3f9d7e2f47
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -1222,7 +1222,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. -->
|
||||
|
||||
Reference in New Issue
Block a user