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

Commit b6f39d28 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "1/ Define biometric_auth_pattern_view_size for pattern view size"

parents 8bfc4e39 daa874ce

packages/SystemUI/res/layout-land/auth_credential_pattern_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ 
        <com.android.internal.widget.LockPatternView

            android:id="@+id/lockPattern"

            android:layout_gravity="center"

            android:layout_width="match_parent"

            android:layout_height="match_parent"/>

            android:layout_width="@dimen/biometric_auth_pattern_view_size"

            android:layout_height="@dimen/biometric_auth_pattern_view_size"/>



        <TextView

            android:id="@+id/error"

packages/SystemUI/res/layout/auth_credential_pattern_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ 
        <com.android.internal.widget.LockPatternView

            android:id="@+id/lockPattern"

            android:layout_gravity="center"

            android:layout_width="match_parent"

            android:layout_height="match_parent"/>

            android:layout_width="@dimen/biometric_auth_pattern_view_size"

            android:layout_height="@dimen/biometric_auth_pattern_view_size"/>



        <TextView

            android:id="@+id/error"

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

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,10 @@ 
    <dimen name="biometric_dialog_button_negative_max_width">140dp</dimen>

    <dimen name="biometric_dialog_button_positive_max_width">116dp</dimen>



    <!-- Lock pattern view size, align sysui biometric_auth_pattern_view_size -->

    <dimen name="biometric_auth_pattern_view_size">248dp</dimen>

    <dimen name="biometric_auth_pattern_view_max_size">348dp</dimen>



    <dimen name="global_actions_power_dialog_item_height">130dp</dimen>

    <dimen name="global_actions_power_dialog_item_bottom_margin">35dp</dimen>

packages/SystemUI/res/values-land/styles.xml

+5 −5
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ 


    <style name="AuthCredentialPatternContainerStyle">

        <item name="android:gravity">center</item>

        <item name="android:maxHeight">320dp</item>

        <item name="android:maxWidth">320dp</item>

        <item name="android:minHeight">200dp</item>

        <item name="android:minWidth">200dp</item>

        <item name="android:paddingHorizontal">60dp</item>

        <item name="android:maxHeight">@dimen/biometric_auth_pattern_view_max_size</item>

        <item name="android:maxWidth">@dimen/biometric_auth_pattern_view_max_size</item>

        <item name="android:minHeight">@dimen/biometric_auth_pattern_view_size</item>

        <item name="android:minWidth">@dimen/biometric_auth_pattern_view_size</item>

        <item name="android:paddingHorizontal">32dp</item>

        <item name="android:paddingVertical">20dp</item>

    </style>

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

+3 −0
Original line number Diff line number Diff line
@@ -25,5 +25,8 @@ 


    <!-- Home Controls -->

    <dimen name="global_actions_side_margin">12dp</dimen>



    <!-- Biometric Auth pattern view size, better to align keyguard_security_width -->

    <dimen name="biometric_auth_pattern_view_size">298dp</dimen>

</resources>