diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png | bin | 0 -> 479 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png | bin | 0 -> 346 bytes | |||
| -rw-r--r-- | java/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png | bin | 0 -> 605 bytes | |||
| -rw-r--r-- | java/res/drawable/btn_keyboard_key_ics.xml | 9 | ||||
| -rw-r--r-- | java/res/values/attrs.xml | 8 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/kbd_key_styles.xml | 2 | ||||
| -rw-r--r-- | java/res/xml-sw768dp/kbd_key_styles.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/kbd_key_styles.xml | 12 |
8 files changed, 22 insertions, 11 deletions
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png Binary files differnew file mode 100644 index 000000000..8bb66b722 --- /dev/null +++ b/java/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png Binary files differnew file mode 100644 index 000000000..c8d7ee0af --- /dev/null +++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png Binary files differnew file mode 100644 index 000000000..eba91db33 --- /dev/null +++ b/java/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png diff --git a/java/res/drawable/btn_keyboard_key_ics.xml b/java/res/drawable/btn_keyboard_key_ics.xml index 7335cc299..e893da133 100644 --- a/java/res/drawable/btn_keyboard_key_ics.xml +++ b/java/res/drawable/btn_keyboard_key_ics.xml @@ -23,6 +23,13 @@ <item android:state_single="true" android:drawable="@drawable/btn_keyboard_key_dark_normal_holo" /> + <!-- Action keys. --> + + <item android:state_active="true" android:state_pressed="true" + android:drawable="@drawable/btn_keyboard_key_dark_pressed_holo" /> + <item android:state_active="true" + android:drawable="@drawable/btn_keyboard_key_dark_active_holo" /> + <!-- Toggle keys. Use checkable/checked state. --> <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true" @@ -34,7 +41,7 @@ <item android:state_checkable="true" android:drawable="@drawable/btn_keyboard_key_dark_normal_off_holo" /> - <!-- Normal keys --> + <!-- Normal keys. --> <item android:state_pressed="true" android:drawable="@drawable/btn_keyboard_key_light_pressed_holo" /> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 9358c9085..0451c9f94 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -194,8 +194,12 @@ <attr name="moreKeys" format="string" /> <!-- Maximum column of more keys keyboard --> <attr name="maxMoreKeysColumn" format="integer" /> - <!-- Whether this is a functional key which has different key top than normal key. --> - <attr name="isFunctional" format="boolean" /> + <attr name="backgroundType" format="enum"> + <!-- This should be aligned with Key.BACKGROUND_TYPE_* --> + <enum name="normal" value="0" /> + <enum name="functional" value="1" /> + <enum name="action" value="2" /> + </attr> <!-- Whether this is a toggle key. --> <attr name="isSticky" format="boolean" /> <!-- Whether long-pressing on this key will make it repeat. --> diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml index 2c31e27e4..dfc7409ad 100644 --- a/java/res/xml-sw600dp/kbd_key_styles.xml +++ b/java/res/xml-sw600dp/kbd_key_styles.xml @@ -24,7 +24,7 @@ <!-- Base key style for the functional key --> <key-style latin:styleName="functionalKeyStyle" - latin:isFunctional="true" /> + latin:backgroundType="functional" /> <!-- Base key style for the key which may have settings key as popup key --> <switch> <case diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/kbd_key_styles.xml index 6570ebccb..f7dcc2026 100644 --- a/java/res/xml-sw768dp/kbd_key_styles.xml +++ b/java/res/xml-sw768dp/kbd_key_styles.xml @@ -24,7 +24,7 @@ <!-- Functional key styles --> <key-style latin:styleName="functionalKeyStyle" - latin:isFunctional="true" /> + latin:backgroundType="functional" /> <key-style latin:styleName="shiftKeyStyle" latin:code="@integer/key_shift" diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml index 84b1900f0..9df647284 100644 --- a/java/res/xml/kbd_key_styles.xml +++ b/java/res/xml/kbd_key_styles.xml @@ -24,7 +24,7 @@ <!-- Base key style for the functional key --> <key-style latin:styleName="functionalKeyStyle" - latin:isFunctional="true" /> + latin:backgroundType="functional" /> <!-- Base key style for the key which may have settings or tab key as popup key. --> <switch> <case @@ -102,7 +102,7 @@ latin:code="@integer/key_return" latin:keyLabel="@string/label_go_key" latin:keyLabelOption="autoXScale" - latin:parentStyle="functionalKeyStyle" /> + latin:backgroundType="action" /> </case> <case latin:imeAction="actionNext" @@ -112,7 +112,7 @@ latin:code="@integer/key_return" latin:keyLabel="@string/label_next_key" latin:keyLabelOption="autoXScale" - latin:parentStyle="functionalKeyStyle" /> + latin:backgroundType="action" /> </case> <case latin:imeAction="actionDone" @@ -122,7 +122,7 @@ latin:code="@integer/key_return" latin:keyLabel="@string/label_done_key" latin:keyLabelOption="autoXScale" - latin:parentStyle="functionalKeyStyle" /> + latin:backgroundType="action" /> </case> <case latin:imeAction="actionSend" @@ -132,7 +132,7 @@ latin:code="@integer/key_return" latin:keyLabel="@string/label_send_key" latin:keyLabelOption="autoXScale" - latin:parentStyle="functionalKeyStyle" /> + latin:backgroundType="action" /> </case> <case latin:imeAction="actionSearch" @@ -141,7 +141,7 @@ latin:styleName="returnKeyStyle" latin:code="@integer/key_return" latin:keyIcon="iconSearchKey" - latin:parentStyle="functionalKeyStyle" /> + latin:backgroundType="action" /> </case> <default> <key-style |
