diff options
author | Jim Miller <jaggies@google.com> | 2011-11-02 18:32:16 -0700 |
---|---|---|
committer | Jim Miller <jaggies@google.com> | 2011-11-04 17:26:26 -0700 |
commit | d9d09451ccec7c551d5f9c2f1417c9c1de2952a6 (patch) | |
tree | 7f6e5d23f6ab4528a70b9bb7e01b82e0cf65b287 /core/res/res/layout-sw600dp | |
parent | c37f98eab3d6e63f71b1600ea0e4355c6503384b (diff) | |
download | frameworks_base-d9d09451ccec7c551d5f9c2f1417c9c1de2952a6.zip frameworks_base-d9d09451ccec7c551d5f9c2f1417c9c1de2952a6.tar.gz frameworks_base-d9d09451ccec7c551d5f9c2f1417c9c1de2952a6.tar.bz2 |
Fix 5231823: PIN/Password polish on lock screen
Fixes these issues:
- add IME button to switch IMEs on password screen on tablet
- centers '0' on PIN screen for phones and tablets
- tablets now use the same ICS background key asset as phones
- make PIN layout consistent between phones and tablet
- center the I-beam when any button is showing in the password entry field
Change-Id: I4da0173f9b2efeab46617c5a41a8132895b63a97
Diffstat (limited to 'core/res/res/layout-sw600dp')
-rw-r--r-- | core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml | 64 | ||||
-rw-r--r-- | core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml | 60 |
2 files changed, 97 insertions, 27 deletions
diff --git a/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml b/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml index ee1ce5f..b58f081 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml @@ -50,20 +50,56 @@ android:layout_centerVertical="true" android:layout_marginRight="155dip"> - <!-- Password entry field --> - <EditText android:id="@+id/passwordEntry" - android:layout_height="wrap_content" + + <LinearLayout + android:orientation="horizontal" android:layout_width="match_parent" - 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:textColor="#ffffffff" - android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii" - /> + 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="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:textSize="24sp" + android:textAppearance="?android:attr/textAppearanceMedium" + 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" @@ -71,7 +107,7 @@ 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> diff --git a/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml b/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml index 254dd3e..cadb5f8 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml @@ -44,22 +44,56 @@ android:gravity="center"> <!-- Password entry field --> - <EditText android:id="@+id/passwordEntry" - android:layout_height="wrap_content" + <LinearLayout + android:orientation="horizontal" android:layout_width="330dip" - android:singleLine="true" - android:textStyle="normal" - android:inputType="textPassword" - android:gravity="center" + android:layout_height="wrap_content" android:layout_gravity="center" - android:textSize="24sp" android:layout_marginTop="120dip" android:layout_marginBottom="5dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:background="@drawable/lockscreen_password_field_dark" - android:textColor="#ffffffff" - android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii" - /> + android:background="@drawable/lockscreen_password_field_dark"> + + <EditText android:id="@+id/passwordEntry" + android:layout_height="wrap_content" + 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:textAppearance="?android:attr/textAppearanceMedium" + 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" @@ -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" /> |