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

Commit a96cd636 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Improve PIN key layouts." into jb-mr1-lockscreen-dev

parents 807c1a99 80bc85a7

core/res/res/layout/keyguard_pin_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -193,10 +193,10 @@ 
        <ImageButton

            android:id="@+id/key_enter"

            style="@style/Widget.Button.NumPadKey"

            android:gravity="center"

            android:layout_width="0px"

            android:layout_height="match_parent"

            android:layout_weight="1"

			android:paddingRight="30dp"

            android:src="@drawable/sym_keyboard_return_holo"

            android:contentDescription="@string/keyboardview_keycode_enter"

            />

core/res/res/layout/keyguard_sim_pin_view.xml

+3 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
            android:paddingLeft="24dp"

            android:paddingRight="24dp"

            android:background="?android:attr/selectableItemBackground"

            android:contentDescription="@string/keyboardview_keycode_delete"

            />

    </LinearLayout>

    <View
@@ -197,11 +198,12 @@ 
        <ImageButton

            android:id="@+id/key_enter"

            style="@style/Widget.Button.NumPadKey"

            android:gravity="center"

            android:layout_width="0px"

            android:layout_height="match_parent"

            android:layout_weight="1"

			android:paddingRight="30dp"

            android:src="@drawable/sym_keyboard_return_holo"

            android:contentDescription="@string/keyboardview_keycode_enter"

            />

    </LinearLayout>

core/res/res/layout/keyguard_sim_puk_view.xml

+3 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
            android:paddingLeft="24dp"

            android:paddingRight="24dp"

            android:background="?android:attr/selectableItemBackground"

            android:contentDescription="@string/keyboardview_keycode_delete"

            />

    </LinearLayout>

    <View
@@ -198,11 +199,12 @@ 
        <ImageButton

            android:id="@+id/key_enter"

            style="@style/Widget.Button.NumPadKey"

            android:gravity="center"

            android:layout_width="0px"

            android:layout_height="match_parent"

            android:layout_weight="1"

			android:paddingRight="30dp"

            android:src="@drawable/sym_keyboard_return_holo"

            android:contentDescription="@string/keyboardview_keycode_enter"

            />

    </LinearLayout>

core/res/res/values/styles.xml

+2 −1
Original line number Diff line number Diff line
@@ -2482,13 +2482,14 @@ please see styles_device_defaults.xml. 
    <style name="Widget.Button.NumPadKey"

            parent="@android:style/Widget.Button">

        <item name="android:singleLine">true</item>

        <item name="android:padding">6dip</item>

        <item name="android:gravity">left|center_vertical</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

        <item name="android:textSize">34dp</item>

        <item name="android:fontFamily">sans-serif</item>

        <item name="android:textStyle">normal</item>

        <item name="android:textColor">#ffffff</item>

        <item name="android:paddingBottom">10dp</item>

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

    </style>

    <style name="TextAppearance.NumPadKey"

            parent="@android:style/TextAppearance">

policy/src/com/android/internal/policy/impl/keyguard/NumPadKey.java

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ public class NumPadKey extends Button { 
                final String extra = sKlondike[mDigit];

                final int extraLen = extra.length();

                if (extraLen > 0) {

                    builder.append(" ");

                    builder.append(extra);

                    builder.setSpan(

                        new TextAppearanceSpan(context, R.style.TextAppearance_NumPadKey_Klondike),