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

Commit 58a2950b authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Lots of keyguard improvements - Fix "too many attempts" dialogs - Fix... 

Merge "Lots of keyguard improvements - Fix "too many attempts" dialogs - Fix account unlock mechanism so the user can use email account as backup for pattern unlock - Add mechanism to support future account recovery from non-pattern screen - Tune animation timing for flipping security view. - Move password field to the top of the security view - Add padding and visual feedback to navigation area button" into jb-mr1-dev
parents 8c890f8a 258341c3

core/res/res/anim/keyguard_security_animate_in.xml

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillAfter="true"

        android:duration="@integer/flip_duration"

        android:startOffset="@integer/flip_duration" />

        android:duration="@integer/kg_security_flip_duration"

        android:startOffset="@integer/kg_security_flip_duration" />



</set>

core/res/res/anim/keyguard_security_animate_out.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillAfter="true"

        android:duration="@integer/flip_duration" />

        android:duration="@integer/kg_security_flip_duration" />



</set>

core/res/res/layout/keyguard_navigation.xml

+6 −13
Original line number Diff line number Diff line
@@ -23,12 +23,15 @@ 
    android:gravity="left">



    <LinearLayout

        android:id="@+id/keyguard_click_area"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal">

        android:orientation="horizontal"

        style="?android:attr/buttonBarButtonStyle"

        android:padding="10dip"

        android:clickable="true">



        <TextView

            android:id="@+id/back"

            android:layout_width="20dip"

            android:layout_height="wrap_content"

            android:textSize="28dp"
@@ -36,7 +39,7 @@ 


        <!-- message area for security screen -->

        <TextView

            android:id="@+id/message_area"

            android:id="@+id/keyguard_message_area"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"
@@ -48,14 +51,4 @@ 


    </LinearLayout>



    <!-- This is currently only uses for pattern unlock -->

    <Button android:id="@+id/forgot_password_button"

        android:layout_gravity="right"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textSize="@*android:dimen/keyguard_lockscreen_status_line_font_size"

        android:drawableLeft="@*android:drawable/lockscreen_forgot_password_button"

        android:drawablePadding="0dip"

        android:visibility="gone"/>



</LinearLayout>

core/res/res/layout/keyguard_password_view.xml

+5 −5
Original line number Diff line number Diff line
@@ -26,11 +26,6 @@ 


    <include layout="@layout/keyguard_navigation"/>



    <Space

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1"/>



    <!-- Password entry field -->

    <!-- Note: the entire container is styled to look like the edit field,

         since the backspace/IME switcher looks better inside -->
@@ -84,6 +79,11 @@ 


    </LinearLayout>



    <Space

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1"/>



    <!-- Numeric keyboard -->

    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"

        android:layout_width="match_parent"

core/res/res/layout/keyguard_pattern_view.xml

+9 −0
Original line number Diff line number Diff line
@@ -36,6 +36,15 @@ 


        <Space android:layout_gravity="fill" />



        <Button android:id="@+id/forgot_password_button"

            android:layout_gravity="right"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textSize="@*android:dimen/keyguard_lockscreen_status_line_font_size"

            android:drawableLeft="@*android:drawable/lockscreen_forgot_password_button"

            android:drawablePadding="0dip"

            android:visibility="gone"/>



        <!-- We need MATCH_PARENT here only to force the size of the parent to be passed to

        the pattern view for it to compute its size. This is an unusual case, caused by

        LockPatternView's requirement to maintain a square aspect ratio based on the width