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

Commit 02cefe27 authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Move slide to unlock circle up" into klp-dev

parents 95b1bbfe f40ec0f0

packages/Keyguard/res/layout/keyguard_glow_pad_container.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,5 +22,5 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom|center_horizontal"

        android:layout_marginBottom="-80dp"/>

        android:layout_marginBottom="@dimen/glowpadcontainer_bottom_margin"/>

</merge>

packages/Keyguard/res/values-sw360dp/dimens.xml

+5 −1
Original line number Diff line number Diff line
@@ -19,7 +19,11 @@ 
-->

<resources>



    <!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->

    <!-- Height of the sliding KeyguardSecurityContainer (includes 2x

         keyguard_security_view_margin) -->

    <dimen name="keyguard_security_height">400dp</dimen>



    <!-- The bottom margin for the GlowPadView container -->

    <dimen name="glowpadcontainer_bottom_margin">-48dp</dimen>



</resources>

packages/Keyguard/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ 
    <!-- Size of lockscreen outerring on unsecure unlock LockScreen -->

    <dimen name="keyguard_lockscreen_outerring_diameter">270dp</dimen>



    <!-- The bottom margin for the GlowPadView container -->

    <dimen name="glowpadcontainer_bottom_margin">-80dp</dimen>



    <!-- Default target placement radius for GlowPadView. Should be 1/2 of outerring diameter. -->

    <dimen name="glowpadview_target_placement_radius">135dip</dimen>