diff options
Diffstat (limited to 'java/res')
22 files changed, 156 insertions, 138 deletions
diff --git a/java/res/anim/more_keys_keyboard_fadein.xml b/java/res/anim/more_keys_keyboard_fadein.xml deleted file mode 100644 index c781f36ad..000000000 --- a/java/res/anim/more_keys_keyboard_fadein.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, 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. -*/ ---> - -<set - xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:anim/decelerate_interpolator" -> - <alpha - android:fromAlpha="0.5" - android:toAlpha="1.0" - android:duration="@integer/config_more_keys_keyboard_fadein_anim_time" /> -</set> diff --git a/java/res/anim/more_keys_keyboard_fadeout.xml b/java/res/anim/more_keys_keyboard_fadeout.xml deleted file mode 100644 index 32fae6bd8..000000000 --- a/java/res/anim/more_keys_keyboard_fadeout.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, 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. -*/ ---> - -<set - xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:anim/accelerate_interpolator" -> - <alpha - android:fromAlpha="1.0" - android:toAlpha="0.0" - android:duration="@integer/config_more_keys_keyboard_fadeout_anim_time" /> -</set> diff --git a/java/res/drawable/btn_keyboard_key_lxx_dark.xml b/java/res/drawable/btn_keyboard_key_lxx_dark.xml index bb1789ae3..c82c13829 100644 --- a/java/res/drawable/btn_keyboard_key_lxx_dark.xml +++ b/java/res/drawable/btn_keyboard_key_lxx_dark.xml @@ -15,6 +15,11 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Custom label action keys. --> + <item android:state_active="true" android:state_checked="true" android:state_pressed="true" + android:drawable="@color/key_background_pressed_lxx_dark" /> + <item android:state_active="true" android:state_checked="true" + android:drawable="@color/key_background_lxx_dark" /> <!-- Action keys. --> <item android:state_active="true" android:state_pressed="true" android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_dark" /> diff --git a/java/res/drawable/btn_keyboard_key_lxx_light.xml b/java/res/drawable/btn_keyboard_key_lxx_light.xml index 60fe02dd2..f237fbea9 100644 --- a/java/res/drawable/btn_keyboard_key_lxx_light.xml +++ b/java/res/drawable/btn_keyboard_key_lxx_light.xml @@ -15,6 +15,11 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Custom label action keys. --> + <item android:state_active="true" android:state_checked="true" android:state_pressed="true" + android:drawable="@color/key_background_pressed_lxx_light" /> + <item android:state_active="true" android:state_checked="true" + android:drawable="@color/key_background_lxx_light" /> <!-- Action keys. --> <item android:state_active="true" android:state_pressed="true" android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_light" /> diff --git a/java/res/values-land/config.xml b/java/res/values-land/config.xml index 5eea4c1c6..34d6d4e19 100644 --- a/java/res/values-land/config.xml +++ b/java/res/values-land/config.xml @@ -43,10 +43,12 @@ <fraction name="config_key_preview_text_ratio">90%</fraction> <fraction name="config_key_letter_ratio">65%</fraction> - <fraction name="config_key_large_letter_ratio">74%</fraction> + <fraction name="config_key_large_letter_ratio_holo">74%</fraction> + <fraction name="config_key_large_letter_ratio_lxx">90%</fraction> <fraction name="config_key_label_ratio">40%</fraction> <fraction name="config_key_hint_letter_ratio">30%</fraction> - <fraction name="config_key_hint_label_ratio">52%</fraction> + <fraction name="config_key_hint_label_ratio_holo">52%</fraction> + <fraction name="config_key_hint_label_ratio_lxx">30%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">40%</fraction> <fraction name="config_language_on_spacebar_text_ratio">40.000%</fraction> diff --git a/java/res/values-sw600dp-land/config.xml b/java/res/values-sw600dp-land/config.xml index 6368eef41..c238b2c42 100644 --- a/java/res/values-sw600dp-land/config.xml +++ b/java/res/values-sw600dp-land/config.xml @@ -33,10 +33,12 @@ <fraction name="config_key_horizontal_gap_holo">0.9%p</fraction> <fraction name="config_key_letter_ratio">50%</fraction> - <fraction name="config_key_large_letter_ratio">48%</fraction> + <fraction name="config_key_large_letter_ratio_holo">48%</fraction> + <fraction name="config_key_large_letter_ratio_lxx">60%</fraction> <fraction name="config_key_label_ratio">32%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction> - <fraction name="config_key_hint_label_ratio">34%</fraction> + <fraction name="config_key_hint_label_ratio_holo">34%</fraction> + <fraction name="config_key_hint_label_ratio_lxx">20%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">29%</fraction> <fraction name="config_language_on_spacebar_text_ratio">30.0%</fraction> <dimen name="config_key_shifted_letter_hint_padding">4dp</dimen> diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml index 9d16e2cb9..3c489bbe8 100644 --- a/java/res/values-sw600dp/config.xml +++ b/java/res/values-sw600dp/config.xml @@ -45,11 +45,12 @@ <dimen name="config_key_preview_height">94.5dp</dimen> <fraction name="config_key_preview_text_ratio">50%</fraction> <fraction name="config_key_letter_ratio">42%</fraction> - <fraction name="config_key_large_letter_ratio">45%</fraction> + <fraction name="config_key_large_letter_ratio_holo">45%</fraction> + <fraction name="config_key_large_letter_ratio_lxx">60%</fraction> <fraction name="config_key_label_ratio">25%</fraction> - <fraction name="config_key_large_label_ratio">32%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction> - <fraction name="config_key_hint_label_ratio">28%</fraction> + <fraction name="config_key_hint_label_ratio_holo">28%</fraction> + <fraction name="config_key_hint_label_ratio_lxx">20%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">22%</fraction> <fraction name="config_language_on_spacebar_text_ratio">28.0%</fraction> <dimen name="config_key_hint_letter_padding">3dp</dimen> diff --git a/java/res/values-sw768dp-land/config.xml b/java/res/values-sw768dp-land/config.xml index a1659b45a..587a3c1a4 100644 --- a/java/res/values-sw768dp-land/config.xml +++ b/java/res/values-sw768dp-land/config.xml @@ -35,10 +35,12 @@ <dimen name="config_key_preview_height">107.1dp</dimen> <fraction name="config_key_letter_ratio">43%</fraction> - <fraction name="config_key_large_letter_ratio">42%</fraction> + <fraction name="config_key_large_letter_ratio_holo">42%</fraction> + <fraction name="config_key_large_letter_ratio_lxx">60%</fraction> <fraction name="config_key_label_ratio">28%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction> - <fraction name="config_key_hint_label_ratio">28%</fraction> + <fraction name="config_key_hint_label_ratio_holo">28%</fraction> + <fraction name="config_key_hint_label_ratio_lxx">20%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">24%</fraction> <fraction name="config_language_on_spacebar_text_ratio">24.00%</fraction> diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml index 635061d24..f573c40df 100644 --- a/java/res/values-sw768dp/config.xml +++ b/java/res/values-sw768dp/config.xml @@ -43,11 +43,12 @@ <dimen name="config_key_preview_height">94.5dp</dimen> <fraction name="config_key_preview_text_ratio">50%</fraction> <fraction name="config_key_letter_ratio">40%</fraction> - <fraction name="config_key_large_letter_ratio">42%</fraction> + <fraction name="config_key_large_letter_ratio_holo">42%</fraction> + <fraction name="config_key_large_letter_ratio_lxx">60%</fraction> <fraction name="config_key_label_ratio">28%</fraction> - <fraction name="config_key_large_label_ratio">28%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction> - <fraction name="config_key_hint_label_ratio">28%</fraction> + <fraction name="config_key_hint_label_ratio_holo">28%</fraction> + <fraction name="config_key_hint_label_ratio_lxx">20%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">26%</fraction> <fraction name="config_language_on_spacebar_text_ratio">29.03%</fraction> <dimen name="config_key_hint_letter_padding">3dp</dimen> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 9a2227321..bfe385698 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -270,9 +270,10 @@ <enum name="empty" value="0" /> <enum name="normal" value="1" /> <enum name="functional" value="2" /> - <enum name="action" value="3" /> - <enum name="stickyOff" value="4" /> - <enum name="stickyOn" value="5" /> + <enum name="stickyOff" value="3" /> + <enum name="stickyOn" value="4" /> + <enum name="action" value="5" /> + <enum name="customAction" value="6" /> </attr> <!-- The key action flags. --> <attr name="keyActionFlags" format="integer"> @@ -291,14 +292,15 @@ <!-- The key label flags. --> <attr name="keyLabelFlags" format="integer"> <!-- This should be aligned with Key.LABEL_FLAGS__* --> - <flag name="alignLeftOfCenter" value="0x08" /> + <flag name="alignHintLabelToBottom" value="0x02" /> + <flag name="alignIconToBottom" value="0x04" /> + <flag name="alignLabelOffCenter" value="0x08" /> <flag name="fontNormal" value="0x10" /> <flag name="fontMonoSpace" value="0x20" /> <flag name="fontDefault" value="0x30" /> <flag name="followKeyLargeLetterRatio" value="0x40" /> <flag name="followKeyLetterRatio" value="0x80" /> <flag name="followKeyLabelRatio" value="0xC0" /> - <flag name="followKeyLargeLabelRatio" value="0x100" /> <flag name="followKeyHintLabelRatio" value="0x140" /> <flag name="hasPopupHint" value="0x200" /> <flag name="hasShiftedLetterHint" value="0x400" /> @@ -357,8 +359,6 @@ <attr name="keyLabelSize" format="dimension|fraction" /> <!-- Large size of the text for one letter keys, in the proportion of key height. --> <attr name="keyLargeLetterRatio" format="fraction" /> - <!-- Large size of the text for keys with multiple letters, in the proportion of key height. --> - <attr name="keyLargeLabelRatio" format="fraction" /> <!-- Size of the text for hint letter (= one character hint label), in the proportion of key height. --> <attr name="keyHintLetterRatio" format="fraction" /> @@ -366,6 +366,14 @@ <attr name="keyHintLabelRatio" format="fraction" /> <!-- Size of the text for shifted letter hint, in the proportion of key height. --> <attr name="keyShiftedLetterHintRatio" format="fraction" /> + <!-- The label's horizontal offset to the center of the key. Negative is to left and + positive is to right. The value is in proportion of the width of + TypefaceUtils.KEY_LABEL_REFERENCE_CHAR. --> + <attr name="keyLabelOffCenterRatio" format="fraction" /> + <!-- The hint label's horizontal offset to the center of the key. Negative is to left and + positive is to right. The value is in proportion of the width of + TypefaceUtils.KEY_LABEL_REFERENCE_CHAR. --> + <attr name="keyHintLabelOffCenterRatio" format="fraction" /> <!-- Color to use for the label in a key. --> <attr name="keyTextColor" format="color" /> <attr name="keyTextShadowColor" format="color" /> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index d748c9179..af3b5890b 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -47,11 +47,12 @@ <dimen name="config_key_preview_height">80dp</dimen> <fraction name="config_key_preview_text_ratio">82%</fraction> <fraction name="config_key_letter_ratio">55%</fraction> - <fraction name="config_key_large_letter_ratio">65%</fraction> + <fraction name="config_key_large_letter_ratio_holo">65%</fraction> + <fraction name="config_key_large_letter_ratio_lxx">90%</fraction> <fraction name="config_key_label_ratio">34%</fraction> - <fraction name="config_key_large_label_ratio">40%</fraction> <fraction name="config_key_hint_letter_ratio">25%</fraction> - <fraction name="config_key_hint_label_ratio">44%</fraction> + <fraction name="config_key_hint_label_ratio_holo">44%</fraction> + <fraction name="config_key_hint_label_ratio_lxx">30%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">35%</fraction> <fraction name="config_language_on_spacebar_text_ratio">33.735%</fraction> <dimen name="config_key_hint_letter_padding">1dp</dimen> diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml index b139110ca..46f255399 100644 --- a/java/res/values/themes-common.xml +++ b/java/res/values/themes-common.xml @@ -22,23 +22,27 @@ <style name="KeyboardIcons" /> <!-- Default theme values --> <style name="Keyboard"> - <item name="touchPositionCorrectionData">@array/touch_position_correction_data_default</item> <item name="rowHeight">25%p</item> - <item name="moreKeysTemplate">@xml/kbd_more_keys_keyboard_template</item> + <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item> + <item name="verticalGap">@fraction/config_key_vertical_gap_holo</item> + <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item> + <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item> + <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item> <item name="keyboardLeftPadding">@fraction/config_keyboard_left_padding</item> <item name="keyboardRightPadding">@fraction/config_keyboard_right_padding</item> + <item name="moreKeysTemplate">@xml/kbd_more_keys_keyboard_template</item> <item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item> </style> <style name="KeyboardView"> - <item name="keyBackground">@drawable/btn_keyboard_key_klp</item> <item name="keyLetterSize">@fraction/config_key_letter_ratio</item> - <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item> + <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_holo</item> <item name="keyLabelSize">@fraction/config_key_label_ratio</item> - <item name="keyLargeLabelRatio">@fraction/config_key_large_label_ratio</item> <item name="keyHintLetterRatio">@fraction/config_key_hint_letter_ratio</item> - <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</item> + <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_holo</item> <item name="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio</item> <item name="keyTypeface">normal</item> + <!-- A negative value to disable key text shadow layer. --> + <item name="keyTextShadowRadius">-1.0</item> <item name="keyHintLetterPadding">@dimen/config_key_hint_letter_padding</item> <item name="keyPopupHintLetterPadding">@dimen/config_key_popup_hint_letter_padding</item> <item name="keyShiftedLetterHintPadding">@dimen/config_key_shifted_letter_hint_padding</item> @@ -130,8 +134,4 @@ <item name="android:singleLine">true</item> <item name="android:ellipsize">none</item> </style> - <style name="MoreKeysKeyboardAnimation"> - <item name="android:windowEnterAnimation">@anim/more_keys_keyboard_fadein</item> - <item name="android:windowExitAnimation">@anim/more_keys_keyboard_fadeout</item> - </style> </resources> diff --git a/java/res/values/themes-holo.xml b/java/res/values/themes-holo.xml new file mode 100644 index 000000000..cb3ad7a3a --- /dev/null +++ b/java/res/values/themes-holo.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Holo KeyboardView theme (ICS and KLP) --> + <style + name="KeyboardView.Holo" + parent="KeyboardView" + > + <item name="keyTypeface">bold</item> + <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_holo</item> + <item name="keyLabelOffCenterRatio">-175%</item> + <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_holo</item> + <item name="keyHintLabelOffCenterRatio">200%</item> + <!-- U+2026: "…" HORIZONTAL ELLIPSIS --> + <item name="keyPopupHintLetter">…</item> + </style> +</resources> diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml index a6f390cbb..6fddcb905 100644 --- a/java/res/values/themes-ics.xml +++ b/java/res/values/themes-ics.xml @@ -35,21 +35,15 @@ > <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> <item name="themeId">2</item> - <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item> - <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item> - <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item> - <item name="verticalGap">@fraction/config_key_vertical_gap_holo</item> - <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item> </style> <style name="KeyboardView.ICS" - parent="KeyboardView" + parent="KeyboardView.Holo" > <item name="android:background">@drawable/keyboard_background_holo</item> <item name="keyBackground">@drawable/btn_keyboard_key_ics</item> <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_ics</item> <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_ics</item> - <item name="keyTypeface">bold</item> <item name="keyTextColor">@color/key_text_color_holo</item> <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_holo</item> <item name="functionalTextColor">@color/key_text_color_holo</item> @@ -58,10 +52,6 @@ <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_holo</item> <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_holo</item> <item name="keyPreviewTextColor">@color/key_text_color_holo</item> - <!-- A negative value to disable key text shadow layer. --> - <item name="keyTextShadowRadius">-1.0</item> - <!-- U+2026: "…" HORIZONTAL ELLIPSIS --> - <item name="keyPopupHintLetter">…</item> </style> <style name="MainKeyboardView.ICS" diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml index 8782a76aa..c9b83316c 100644 --- a/java/res/values/themes-klp.xml +++ b/java/res/values/themes-klp.xml @@ -35,21 +35,15 @@ > <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> <item name="themeId">0</item> - <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item> - <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item> - <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item> - <item name="verticalGap">@fraction/config_key_vertical_gap_holo</item> - <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item> </style> <style name="KeyboardView.KLP" - parent="KeyboardView" + parent="KeyboardView.Holo" > <item name="android:background">@drawable/keyboard_background_holo</item> <item name="keyBackground">@drawable/btn_keyboard_key_klp</item> <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_klp</item> <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_klp</item> - <item name="keyTypeface">bold</item> <item name="keyTextColor">@color/key_text_color_holo</item> <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_holo</item> <item name="functionalTextColor">@color/key_text_color_holo</item> @@ -58,10 +52,6 @@ <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_holo</item> <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_holo</item> <item name="keyPreviewTextColor">@color/key_text_color_holo</item> - <!-- A negative value to disable key text shadow layer. --> - <item name="keyTextShadowRadius">-1.0</item> - <!-- U+2026: "…" HORIZONTAL ELLIPSIS --> - <item name="keyPopupHintLetter">…</item> </style> <style name="MainKeyboardView.KLP" diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml index fa6aa62e5..6afbd9b15 100644 --- a/java/res/values/themes-lxx-dark.xml +++ b/java/res/values/themes-lxx-dark.xml @@ -35,22 +35,15 @@ > <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> <item name="themeId">4</item> - <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item> - <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item> - <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item> - <item name="verticalGap">@fraction/config_key_vertical_gap_holo</item> - <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item> </style> <style name="KeyboardView.LXX_Dark" - parent="KeyboardView" + parent="KeyboardView.LXX" > <item name="android:background">@drawable/keyboard_background_lxx_dark</item> <item name="keyBackground">@drawable/btn_keyboard_key_lxx_dark</item> <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_dark</item> <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_dark</item> - <item name="spacebarIconWidthRatio">0.9</item> - <item name="keyTypeface">normal</item> <item name="keyTextColor">@color/key_text_color_lxx_dark</item> <item name="keyTextInactivatedColor">@color/key_functional_text_color_lxx_dark</item> <item name="functionalTextColor">@color/key_text_color_lxx_dark</item> @@ -59,9 +52,6 @@ <item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_dark</item> <item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_lxx_dark</item> <item name="keyPreviewTextColor">@color/key_text_color_lxx_dark</item> - <!-- A negative value to disable key text shadow layer. --> - <item name="keyTextShadowRadius">-1.0</item> - <item name="keyPopupHintLetter"></item> <!-- No popup hint letter --> </style> <style name="MainKeyboardView.LXX_Dark" diff --git a/java/res/values/themes-lxx-light.xml b/java/res/values/themes-lxx-light.xml index e7350f924..b3ced80a1 100644 --- a/java/res/values/themes-lxx-light.xml +++ b/java/res/values/themes-lxx-light.xml @@ -35,22 +35,15 @@ > <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> <item name="themeId">3</item> - <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item> - <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item> - <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item> - <item name="verticalGap">@fraction/config_key_vertical_gap_holo</item> - <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item> </style> <style name="KeyboardView.LXX_Light" - parent="KeyboardView" + parent="KeyboardView.LXX" > <item name="android:background">@drawable/keyboard_background_lxx_light</item> <item name="keyBackground">@drawable/btn_keyboard_key_lxx_light</item> <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_light</item> <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_light</item> - <item name="spacebarIconWidthRatio">0.9</item> - <item name="keyTypeface">normal</item> <item name="keyTextColor">@color/key_text_color_lxx_light</item> <item name="keyTextInactivatedColor">@color/key_text_inactive_color_lxx_light</item> <item name="functionalTextColor">@color/key_functional_text_color_lxx_light</item> @@ -59,9 +52,6 @@ <item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_light</item> <item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_lxx_light</item> <item name="keyPreviewTextColor">@color/key_text_color_lxx_light</item> - <!-- A negative value to disable key text shadow layer. --> - <item name="keyTextShadowRadius">-1.0</item> - <item name="keyPopupHintLetter"></item> <!-- No popup hint letter --> </style> <style name="MainKeyboardView.LXX_Light" diff --git a/java/res/values/themes-lxx.xml b/java/res/values/themes-lxx.xml new file mode 100644 index 000000000..1c33cd60b --- /dev/null +++ b/java/res/values/themes-lxx.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- LXX KeyboardView theme (LXX_Light and LXX_Dark) --> + <style + name="KeyboardView.LXX" + parent="KeyboardView" + > + <item name="keyTypeface">normal</item> + <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_lxx</item> + <item name="keyLabelOffCenterRatio">-80%</item> + <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_lxx</item> + <item name="keyHintLabelOffCenterRatio">300%</item> + <item name="keyLabelFlags">alignHintLabelToBottom</item> + <item name="spacebarIconWidthRatio">0.9</item> + <!-- No popup hint letter --> + <item name="keyPopupHintLetter"></item> + </style> +</resources> diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml index 740bf3543..d0167d336 100644 --- a/java/res/xml-sw600dp/key_styles_enter.xml +++ b/java/res/xml-sw600dp/key_styles_enter.xml @@ -230,6 +230,7 @@ latin:styleName="enterKeyStyle" latin:keySpec="dummy_label|!code/key_enter" latin:keyLabelFlags="fromCustomActionLabel" + latin:backgroundType="customAction" latin:parentStyle="defaultEnterKeyStyle" /> </case> <!-- imeAction is either actionNone or actionUnspecified. --> diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml index 770bf3876..960c79c18 100644 --- a/java/res/xml/key_styles_enter.xml +++ b/java/res/xml/key_styles_enter.xml @@ -398,6 +398,7 @@ latin:styleName="enterKeyStyle" latin:keySpec="dummy_label|!code/key_enter" latin:keyLabelFlags="fromCustomActionLabel" + latin:backgroundType="customAction" latin:parentStyle="defaultEnterKeyStyle" /> </case> <!-- imeAction is either actionNone or actionUnspecified. --> diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml index f754b99b3..14b202874 100644 --- a/java/res/xml/key_styles_number.xml +++ b/java/res/xml/key_styles_number.xml @@ -39,7 +39,7 @@ latin:parentStyle="numKeyBaseStyle" /> <key-style latin:styleName="numberKeyStyle" - latin:keyLabelFlags="alignLeftOfCenter|hasHintLabel" + latin:keyLabelFlags="alignLabelOffCenter|hasHintLabel" latin:parentStyle="numKeyStyle" /> <key-style latin:styleName="num0KeyStyle" @@ -120,6 +120,7 @@ <key-style latin:styleName="numSpaceKeyStyle" latin:keySpec="!icon/space_key_for_number_layout|!code/key_space" + latin:keyLabelFlags="alignIconToBottom" latin:keyActionFlags="enableLongPress" latin:parentStyle="numKeyBaseStyle" /> </merge> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 5021f33ee..7013c6b86 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -51,7 +51,7 @@ fr_CH: French (Switzerland)/swiss gl_ES: Galician (Spain)/spanish hi: Hindi/hindi - (hi: Hindi/hindi_compact) # This is a preliminary keyboard layout. + hi: Hindi/hindi_compact hr: Croatian/qwertz hu: Hungarian/qwertz hy_AM: Armenian (Armenia) Phonetic/armenian_phonetic @@ -178,6 +178,7 @@ /> <!-- TODO: This bengali keyboard is a preliminary layout. This isn't based on the final specification. --> + <!-- <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0xbff5986c" @@ -186,6 +187,7 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali,EmojiCapable" android:isAsciiCapable="false" /> + --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0xd2e520d5" @@ -346,8 +348,6 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi,EmojiCapable" android:isAsciiCapable="false" /> - <!-- TODO: This hindi_compact keyboard is a preliminary layout. - This isn't based on the final specification. --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic_compact" android:subtypeId="0xe49c89a1" @@ -448,6 +448,7 @@ /> <!-- TODO: This kannada keyboard is a preliminary layout. This isn't based on the final specification. --> + <!-- <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x8c78064f" @@ -456,6 +457,7 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=kannada,EmojiCapable" android:isAsciiCapable="false" /> + --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x2e391c04" @@ -498,6 +500,7 @@ /> <!-- TODO: This malayalam keyboard is a preliminary layout. This isn't based on the final specification. --> + <!-- <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0xc182ebd4" @@ -506,6 +509,7 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=malayalam,EmojiCapable" android:isAsciiCapable="false" /> + --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0xcdcfc3ab" @@ -516,6 +520,7 @@ /> <!-- TODO: This marathi keyboard is a preliminary layout. This isn't based on the final specification. --> + <!-- <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x747b9f03" @@ -524,6 +529,7 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=marathi,EmojiCapable" android:isAsciiCapable="false" /> + --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x84c87c61" @@ -534,6 +540,7 @@ /> <!-- TODO: This Myanmar keyboard is a preliminary layout. This isn't based on the final specification. --> + <!-- <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0xea266ea4" @@ -542,6 +549,7 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=myanmar,EmojiCapable,CombiningRules=MyanmarReordering" android:isAsciiCapable="false" /> + --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x3f12ee14" @@ -624,6 +632,7 @@ /> <!-- TODO: This sinhala keyboard is a preliminary layout. This isn't based on the final specification. --> + <!-- <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x5c6b3bde" @@ -632,6 +641,7 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=sinhala,EmojiCapable" android:isAsciiCapable="false" /> + --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x8e94d413" @@ -692,6 +702,7 @@ /> <!-- TODO: This tamil keyboard is a preliminary layout. This isn't based on the final specification. --> + <!-- <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x67acea2a" @@ -700,8 +711,10 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable" android:isAsciiCapable="false" /> + --> <!-- TODO: This telugu keyboard is a preliminary layout. This isn't based on the final specification. --> + <!-- <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x1e177389" @@ -710,6 +723,7 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=telugu,EmojiCapable" android:isAsciiCapable="false" /> + --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x1f94d5d4" |