Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 3381660: Make modifier keys in PasswordUnlock match IME

Browse Source 
Fixed modifier key assets to match Latin IME.
Added background to alphanumeric keyboard.
Added 25% alpha background to numeric keyboard.

Change-Id: I043171a5dec7eeb0c136bb7450fd4023208639dc
This commit is contained in:
Jim Miller
2011-01-24 19:53:32 -08:00
parent b894210882
commit 92be52c3ed
11 changed files with 81 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/res/res/drawable-mdpi/password_keyboard_background_holo.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
core/res/res/drawable-xlarge-mdpi/sym_keyboard_delete_holo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
core/res/res/drawable-xlarge-mdpi/sym_keyboard_shift.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
core/res/res/drawable-xlarge-mdpi/sym_keyboard_shift_locked.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

5
core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml
View File

@@ -69,7 +69,7 @@
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_width="330dip"
android:layout_height="330dip"
android:background="#00000000"
android:background="#40000000"
android:layout_marginTop="5dip"
android:keyBackground="@drawable/btn_keyboard_key_fulltrans"
android:visibility="gone"
@@ -88,8 +88,9 @@
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboardAlpha"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#00000000"
android:background="@drawable/password_keyboard_background_holo"
android:keyBackground="@drawable/btn_keyboard_key_fulltrans"
android:keyTextSize="28dip"
android:visibility="gone"
/>

13
core/res/res/layout-xlarge/keyguard_screen_password_portrait.xml
View File

@@ -61,19 +61,28 @@
android:textColor="#ffffffff"
/>
<View
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="330dip"
android:layout_height="260dip"
android:background="#00000000"
android:background="#40000000"
android:keyBackground="@drawable/btn_keyboard_key_fulltrans"
android:layout_marginBottom="80dip"
/>
<!-- Alphanumeric keyboard -->
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboardAlpha"
android:layout_width="match_parent"
android:layout_height="230dip"
android:background="#00000000"
android:background="@drawable/password_keyboard_background_holo"
android:keyBackground="@drawable/btn_keyboard_key_fulltrans"
android:keyTextSize="28dip"
android:visibility="gone"
/>

59
core/res/res/xml-xlarge/password_kbd_numeric.xml Executable file
View File

@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2011, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="33.33%p"
android:verticalGap="0px"
android:keyHeight="@dimen/password_keyboard_key_height_numeric"
>
<Row android:rowEdgeFlags="top">
<Key android:codes="49" android:keyIcon="@drawable/sym_keyboard_num1"
android:keyEdgeFlags="left"/>
<Key android:codes="50" android:keyIcon="@drawable/sym_keyboard_num2"/>
<Key android:codes="51" android:keyIcon="@drawable/sym_keyboard_num3"
android:keyEdgeFlags="right"/>
</Row>
<Row>
<Key android:codes="52" android:keyIcon="@drawable/sym_keyboard_num4"
android:keyEdgeFlags="left"/>
<Key android:codes="53" android:keyIcon="@drawable/sym_keyboard_num5"/>
<Key android:codes="54" android:keyIcon="@drawable/sym_keyboard_num6"
android:keyEdgeFlags="right"/>
</Row>
<Row>
<Key android:codes="55" android:keyIcon="@drawable/sym_keyboard_num7"
android:keyEdgeFlags="left"/>
<Key android:codes="56" android:keyIcon="@drawable/sym_keyboard_num8"/>
<Key android:codes="57" android:keyIcon="@drawable/sym_keyboard_num9"
android:keyEdgeFlags="right"/>
</Row>
<Row android:rowEdgeFlags="bottom">
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_ok"
android:keyEdgeFlags="left"/>
<Key android:codes="48" android:keyIcon="@drawable/sym_keyboard_num0_no_plus"/>
<Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
android:isRepeatable="true" android:keyEdgeFlags="right"/>
</Row>
</Keyboard>

10
core/res/res/xml-xlarge/password_kbd_qwerty.xml
View File

@@ -38,10 +38,9 @@
<Key android:keyLabel="i"/>
<Key android:keyLabel="o"/>
<Key android:keyLabel="p"/>
<Key android:keyIcon="@drawable/sym_keyboard_delete"
<Key android:keyIcon="@drawable/sym_keyboard_delete_holo"
android:codes="-5"
android:keyWidth="9.331%p"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
android:isRepeatable="true"
android:keyEdgeFlags="right"/>
</Row>
@@ -62,7 +61,6 @@
<Key android:keyLabel="l"/>
<Key android:codes="10"
android:keyIcon="@drawable/sym_keyboard_ok"
android:iconPreview="@drawable/sym_keyboard_feedback_ok"
android:keyWidth="15.750%p"
android:keyEdgeFlags="right"/>
</Row>
@@ -72,7 +70,6 @@
android:keyIcon="@drawable/sym_keyboard_shift"
android:keyWidth="15.192%p"
android:isModifier="true"
android:iconPreview="@drawable/sym_keyboard_feedback_shift"
android:isSticky="true"
android:keyEdgeFlags="left"/>
<Key android:keyLabel="z"/>
@@ -88,7 +85,6 @@
android:keyIcon="@drawable/sym_keyboard_shift"
android:keyWidth="12.530%p"
android:isModifier="true"
android:iconPreview="@drawable/sym_keyboard_feedback_shift"
android:isSticky="true"
android:keyEdgeFlags="right"/>
</Row>
@@ -96,9 +92,7 @@
<Row android:keyWidth="8.042%p"
android:keyboardMode="@+id/mode_normal">
<Key android:keyLabel="/" android:horizontalGap="24.126%p"/>
<Key android:codes="32"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
<Key android:keyLabel=" "
android:keyWidth="37.454%p"/>
<Key android:keyLabel="'" />
<Key android:keyLabel="-" />

10
core/res/res/xml-xlarge/password_kbd_qwerty_shifted.xml
View File

@@ -38,10 +38,9 @@
<Key android:keyLabel="I"/>
<Key android:keyLabel="O"/>
<Key android:keyLabel="P"/>
<Key android:keyIcon="@drawable/sym_keyboard_delete"
<Key android:keyIcon="@drawable/sym_keyboard_delete_holo"
android:codes="-5"
android:keyWidth="9.331%p"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
android:isRepeatable="true"
android:keyEdgeFlags="right"/>
</Row>
@@ -62,7 +61,6 @@
<Key android:keyLabel="L"/>
<Key android:codes="10"
android:keyIcon="@drawable/sym_keyboard_ok"
android:iconPreview="@drawable/sym_keyboard_feedback_ok"
android:keyWidth="15.750%p"
android:keyEdgeFlags="right"/>
</Row>
@@ -72,7 +70,6 @@
android:keyIcon="@drawable/sym_keyboard_shift"
android:keyWidth="15.192%p"
android:isModifier="true"
android:iconPreview="@drawable/sym_keyboard_feedback_shift"
android:isSticky="true"
android:keyEdgeFlags="left"/>
<Key android:keyLabel="Z"/>
@@ -88,7 +85,6 @@
android:keyIcon="@drawable/sym_keyboard_shift"
android:keyWidth="12.530%p"
android:isModifier="true"
android:iconPreview="@drawable/sym_keyboard_feedback_shift"
android:isSticky="true"
android:keyEdgeFlags="right"/>
</Row>
@@ -96,9 +92,7 @@
<Row android:keyWidth="8.042%p"
android:keyboardMode="@+id/mode_normal">
<Key android:keyLabel="\@" android:horizontalGap="24.126%p"/>
<Key android:codes="32"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
<Key android:keyLabel=" "
android:keyWidth="37.454%p"/>
<Key android:keyLabel="&quot;" />
<Key android:keyLabel="_" />

8
core/res/res/xml-xlarge/password_kbd_symbols.xml
View File

@@ -38,10 +38,9 @@
<Key android:keyLabel="8"/>
<Key android:keyLabel="9"/>
<Key android:keyLabel="0"/>
<Key android:keyIcon="@drawable/sym_keyboard_delete"
<Key android:keyIcon="@drawable/sym_keyboard_delete_holo"
android:codes="-5"
android:keyWidth="9.331%p"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
android:isRepeatable="true"
android:keyEdgeFlags="right"/>
</Row>
@@ -62,7 +61,6 @@
<Key android:keyLabel=")"/>
<Key android:codes="10"
android:keyIcon="@drawable/sym_keyboard_ok"
android:iconPreview="@drawable/sym_keyboard_feedback_ok"
android:keyWidth="15.750%p"
android:keyEdgeFlags="right"/>
</Row>
@@ -94,9 +92,7 @@
<Row android:keyWidth="8.042%p">
<Key android:keyLabel="\@" android:horizontalGap="16.084%p"/>
<Key android:keyLabel="/" />
<Key android:codes="32"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
<Key android:keyLabel=" "
android:keyWidth="37.454%p"/>
<Key android:keyLabel="\'" />
<Key android:keyLabel="-" />

8
core/res/res/xml-xlarge/password_kbd_symbols_shift.xml
View File

@@ -37,10 +37,9 @@
<Key android:keyLabel="×" />
<Key android:keyLabel="§" />
<Key android:keyLabel="Δ" />
<Key android:keyIcon="@drawable/sym_keyboard_delete"
<Key android:keyIcon="@drawable/sym_keyboard_delete_holo"
android:codes="-5"
android:keyWidth="9.331%p"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
android:isRepeatable="true"
android:keyEdgeFlags="right"/>
</Row>
@@ -61,7 +60,6 @@
<Key android:keyLabel="}" />
<Key android:codes="10"
android:keyIcon="@drawable/sym_keyboard_ok"
android:iconPreview="@drawable/sym_keyboard_feedback_ok"
android:keyWidth="15.750%p"
android:keyEdgeFlags="right"/>
</Row>
@@ -92,9 +90,7 @@
<!-- This row is intentionally not marked as a bottom row -->
<Row android:keyWidth="8.042%p">
<Key android:codes="32" android:horizontalGap="32.168%p"
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
<Key android:keyLabel=" " android:horizontalGap="32.168%p"
android:keyWidth="37.454%p"/>
</Row>
</Keyboard>