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

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

Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1

parents a50c859d d9d09451

core/res/res/drawable-hdpi/sym_keyboard_num0_no_plus.png

−468 B (970 B)
Loading image diff...

core/res/res/drawable-mdpi/sym_keyboard_num0_no_plus.png

−95 B (683 B)
Loading image diff...

core/res/res/drawable-xhdpi/sym_keyboard_num0_no_plus.png

−495 B (1.29 KiB)
Loading image diff...

core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml

+50 −14
Original line number Diff line number Diff line
@@ -50,28 +50,64 @@ 
            android:layout_centerVertical="true"

            android:layout_marginRight="155dip">



            <!-- Password entry field -->



            <LinearLayout

                android:orientation="horizontal"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:background="@drawable/lockscreen_password_field_dark">



                <EditText android:id="@+id/passwordEntry"

                    android:layout_height="wrap_content"

                android:layout_width="match_parent"

                    android:layout_width="0dip"

                    android:layout_weight="1"

                    android:gravity="center"

                    android:layout_gravity="center"

                    android:layout_marginLeft="@dimen/keyguard_lockscreen_pin_margin_left"

                    android:singleLine="true"

                    android:textStyle="normal"

                    android:inputType="textPassword"

                android:gravity="center"

                    android:textSize="24sp"

                    android:textAppearance="?android:attr/textAppearanceMedium"

                android:background="@drawable/lockscreen_password_field_dark"

                    android:background="@null"

                    android:textColor="#ffffffff"

                    android:imeOptions="flagNoFullscreen|actionDone"

                    android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"

                    />



                <!-- This delete button is only visible for numeric PIN entry -->

                <ImageButton android:id="@+id/pinDel"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:src="@android:drawable/ic_input_delete"

                    android:clickable="true"

                    android:padding="8dip"

                    android:layout_gravity="center"

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

                    android:visibility="gone"

                    />



                <ImageView android:id="@+id/switch_ime_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:src="@drawable/ic_lockscreen_ime"

                    android:clickable="true"

                    android:padding="8dip"

                    android:layout_gravity="center"

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

                    android:visibility="gone"

                    />



            </LinearLayout>



            <!-- Numeric keyboard -->

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

                android:layout_width="330dip"

                android:layout_height="330dip"

                android:background="#40000000"

                android:layout_marginTop="5dip"

                android:keyBackground="@drawable/btn_keyboard_key_fulltrans"

                android:keyBackground="@drawable/btn_keyboard_key_ics"

                android:visibility="gone"

            />

        </LinearLayout>

core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml

+47 −13
Original line number Diff line number Diff line
@@ -44,23 +44,57 @@ 
        android:gravity="center">



        <!-- Password entry field -->

        <LinearLayout

            android:orientation="horizontal"

            android:layout_width="330dip"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:layout_marginTop="120dip"

            android:layout_marginBottom="5dip"

            android:background="@drawable/lockscreen_password_field_dark">



            <EditText android:id="@+id/passwordEntry"

                android:layout_height="wrap_content"

            android:layout_width="330dip"

                android:layout_width="0dip"

                android:layout_weight="1"

                android:singleLine="true"

                android:textStyle="normal"

                android:inputType="textPassword"

                android:gravity="center"

                android:layout_gravity="center"

                android:layout_marginLeft="@dimen/keyguard_lockscreen_pin_margin_left"

                android:textSize="24sp"

            android:layout_marginTop="120dip"

            android:layout_marginBottom="5dip"

                android:textAppearance="?android:attr/textAppearanceMedium"

            android:background="@drawable/lockscreen_password_field_dark"

                android:background="@null"

                android:textColor="#ffffffff"

                android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"

                />



            <!-- This delete button is only visible for numeric PIN entry -->

            <ImageButton android:id="@+id/pinDel"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:src="@android:drawable/ic_input_delete"

                android:clickable="true"

                android:padding="8dip"

                android:layout_gravity="center"

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

                android:visibility="gone"

                />



            <ImageView android:id="@+id/switch_ime_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:src="@drawable/ic_lockscreen_ime"

                android:clickable="true"

                android:padding="8dip"

                android:layout_gravity="center"

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

                android:visibility="gone"

                />



        </LinearLayout>



        <View

            android:layout_width="match_parent"

            android:layout_height="0dip"
@@ -72,7 +106,7 @@ 
            android:layout_width="330dip"

            android:layout_height="260dip"

            android:background="#40000000"

            android:keyBackground="@drawable/btn_keyboard_key_fulltrans"

            android:keyBackground="@drawable/btn_keyboard_key_ics"

            android:layout_marginBottom="80dip"

        />