Rename KLP/JB/ICS common resource name suffixes to _holo
Bug: 11622614
Change-Id: I53b5ff8b6627a38aef352855ad024213a450b40f
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 94fadb9..60a8c29 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -39,15 +39,15 @@
<color name="typed_word_color_ics">#D833B5E5</color>
<color name="suggested_word_color_ics">#B233B5E5</color>
<color name="highlight_translucent_color_ics">#9933B5E5</color>
- <color name="key_text_shadow_color_ics">@android:color/transparent</color>
- <color name="key_text_inactivated_color_ics">#66E0E4E5</color>
- <color name="key_hint_letter_color_ics">#80000000</color>
- <color name="key_hint_label_color_ics">#A0FFFFFF</color>
- <color name="key_shifted_letter_hint_inactivated_color_ics">#66E0E4E5</color>
- <color name="key_shifted_letter_hint_activated_color_ics">@android:color/white</color>
- <color name="spacebar_text_color_ics">#FFC0C0C0</color>
- <color name="spacebar_text_shadow_color_ics">#80000000</color>
- <color name="gesture_floating_preview_color_ics">#C0000000</color>
+ <color name="key_text_shadow_color_holo">@android:color/transparent</color>
+ <color name="key_text_inactivated_color_holo">#66E0E4E5</color>
+ <color name="key_hint_letter_color_holo">#80000000</color>
+ <color name="key_hint_label_color_holo">#A0FFFFFF</color>
+ <color name="key_shifted_letter_hint_inactivated_color_holo">#66E0E4E5</color>
+ <color name="key_shifted_letter_hint_activated_color_holo">@android:color/white</color>
+ <color name="spacebar_text_color_holo">#FFC0C0C0</color>
+ <color name="spacebar_text_shadow_color_holo">#80000000</color>
+ <color name="gesture_floating_preview_color_holo">#C0000000</color>
<!-- Color resources for KLP theme. Base color = F0F0F0 -->
<color name="highlight_color_holo">#FFF0F0F0</color>
<color name="typed_word_color_holo">#D8F0F0F0</color>
@@ -66,6 +66,6 @@
<color name="emoji_key_background_color">#00000000</color>
<color name="emoji_key_pressed_background_color">#30FFFFFF</color>
- <color name="key_text_color_normal_ics">@android:color/white</color>
- <color name="key_text_color_functional_ics">@android:color/white</color>
+ <color name="key_text_color_normal_holo">@android:color/white</color>
+ <color name="key_text_color_functional_holo">@android:color/white</color>
</resources>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 18cb262..4588b10 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -37,10 +37,10 @@
<fraction name="key_bottom_gap_gb">6.495%p</fraction>
<fraction name="key_horizontal_gap_gb">1.971%p</fraction>
- <fraction name="keyboard_top_padding_ics">2.335%p</fraction>
- <fraction name="keyboard_bottom_padding_ics">4.669%p</fraction>
- <fraction name="key_bottom_gap_ics">6.127%p</fraction>
- <fraction name="key_horizontal_gap_ics">1.739%p</fraction>
+ <fraction name="keyboard_top_padding_holo">2.335%p</fraction>
+ <fraction name="keyboard_bottom_padding_holo">4.669%p</fraction>
+ <fraction name="key_bottom_gap_holo">6.127%p</fraction>
+ <fraction name="key_horizontal_gap_holo">1.739%p</fraction>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
<!-- popup_key_height x 1.2 -->
@@ -71,9 +71,9 @@
<fraction name="key_letter_ratio_5row">64%</fraction>
<fraction name="key_uppercase_letter_ratio_5row">41%</fraction>
- <dimen name="key_preview_offset_ics">8.0dp</dimen>
+ <dimen name="key_preview_offset_holo">8.0dp</dimen>
<!-- popup_key_height x -0.5 -->
- <dimen name="more_keys_keyboard_vertical_correction_ics">-26.4dp</dimen>
+ <dimen name="more_keys_keyboard_vertical_correction_holo">-26.4dp</dimen>
<dimen name="suggestions_strip_height">40dp</dimen>
<dimen name="more_suggestions_key_horizontal_padding">12dp</dimen>
diff --git a/java/res/values/keyboard-icons-holo.xml b/java/res/values/keyboard-icons-holo.xml
new file mode 100644
index 0000000..b49e1d1
--- /dev/null
+++ b/java/res/values/keyboard-icons-holo.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, 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">
+ <style name="KeyboardIcons.Holo">
+ <!-- Keyboard icons -->
+ <!-- TODO: The following holo icon for phone (drawable-hdpi and drawable-xhdpi) are missing.
+ sym_keyboard_123_mic_holo
+ -->
+ <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo_dark</item>
+ <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo_dark</item>
+ <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo_dark</item>
+ <item name="iconSpaceKey">@null</item>
+ <item name="iconEnterKey">@drawable/sym_keyboard_return_holo_dark</item>
+ <item name="iconSearchKey">@drawable/sym_keyboard_search_holo_dark</item>
+ <item name="iconTabKey">@drawable/sym_keyboard_tab_holo_dark</item>
+ <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo_dark</item>
+ <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic_holo_dark</item>
+ <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo_dark</item>
+ <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_holo_dark</item>
+ <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_holo_dark</item>
+ <item name="iconTabKeyPreview">@drawable/sym_keyboard_feedback_tab</item>
+ <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch_dark</item>
+ <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo_dark</item>
+ <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo_dark</item>
+ <item name="iconEmojiKey">@drawable/sym_keyboard_smiley_holo_dark</item>
+ </style>
+</resources>
diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml
index 3760771..787bd6e 100644
--- a/java/res/values/themes-common.xml
+++ b/java/res/values/themes-common.xml
@@ -110,7 +110,7 @@
name="EmojiPalettesView"
parent="KeyboardView"
>
- <item name="emojiTabLabelColor">@color/emoji_tab_label_color_ics</item>
+ <item name="emojiTabLabelColor">@color/emoji_tab_label_color_holo</item>
</style>
<style name="MoreKeysKeyboard" />
<style
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml
index a77e685..985c082 100644
--- a/java/res/values/themes-ics.xml
+++ b/java/res/values/themes-ics.xml
@@ -19,7 +19,7 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="KeyboardTheme.ICS" parent="KeyboardIcons.ICS">
+ <style name="KeyboardTheme.ICS" parent="KeyboardIcons.Holo">
<item name="keyboardStyle">@style/Keyboard.ICS</item>
<item name="keyboardViewStyle">@style/KeyboardView.ICS</item>
<item name="mainKeyboardViewStyle">@style/MainKeyboardView.ICS</item>
@@ -30,40 +30,17 @@
<item name="suggestionStripViewStyle">@style/SuggestionStripView.ICS</item>
<item name="suggestionWordStyle">@style/SuggestionWord.ICS</item>
</style>
- <style name="KeyboardIcons.ICS">
- <!-- Keyboard icons -->
- <!-- TODO: The following holo icon for phone (drawable-hdpi and drawable-xhdpi) are missing.
- sym_keyboard_123_mic_holo
- -->
- <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo_dark</item>
- <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo_dark</item>
- <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo_dark</item>
- <item name="iconSpaceKey">@null</item>
- <item name="iconEnterKey">@drawable/sym_keyboard_return_holo_dark</item>
- <item name="iconSearchKey">@drawable/sym_keyboard_search_holo_dark</item>
- <item name="iconTabKey">@drawable/sym_keyboard_tab_holo_dark</item>
- <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo_dark</item>
- <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic_holo_dark</item>
- <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo_dark</item>
- <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_holo_dark</item>
- <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_holo_dark</item>
- <item name="iconTabKeyPreview">@drawable/sym_keyboard_feedback_tab</item>
- <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch_dark</item>
- <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo_dark</item>
- <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo_dark</item>
- <item name="iconEmojiKey">@drawable/sym_keyboard_smiley_holo_dark</item>
- </style>
<style
name="Keyboard.ICS"
parent="Keyboard"
>
<!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
<item name="themeId">0</item>
- <item name="keyboardTopPadding">@fraction/keyboard_top_padding_ics</item>
- <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding_ics</item>
- <item name="horizontalGap">@fraction/key_horizontal_gap_ics</item>
- <item name="verticalGap">@fraction/key_bottom_gap_ics</item>
- <item name="touchPositionCorrectionData">@array/touch_position_correction_data_ics</item>
+ <item name="keyboardTopPadding">@fraction/keyboard_top_padding_holo</item>
+ <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding_holo</item>
+ <item name="horizontalGap">@fraction/key_horizontal_gap_holo</item>
+ <item name="verticalGap">@fraction/key_bottom_gap_holo</item>
+ <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item>
</style>
<style
name="KeyboardView.ICS"
@@ -72,14 +49,14 @@
<item name="android:background">@drawable/keyboard_background_holo</item>
<item name="keyBackground">@drawable/btn_keyboard_key_ics</item>
<item name="keyTypeface">bold</item>
- <item name="keyTextColor">@color/key_text_color_ics</item>
- <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_ics</item>
- <item name="keyHintLetterColor">@color/key_hint_letter_color_ics</item>
- <item name="keyHintLabelColor">@color/key_hint_label_color_ics</item>
- <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_ics</item>
- <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_ics</item>
- <item name="keyPreviewTextColor">@color/key_text_color_ics</item>
- <item name="keyTextShadowColor">@color/key_text_shadow_color_ics</item>
+ <item name="keyTextColor">@color/key_text_color_holo</item>
+ <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_holo</item>
+ <item name="keyHintLetterColor">@color/key_hint_letter_color_holo</item>
+ <item name="keyHintLabelColor">@color/key_hint_label_color_holo</item>
+ <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>
+ <item name="keyTextShadowColor">@color/key_text_shadow_color_holo</item>
<item name="keyTextShadowRadius">0.0</item>
</style>
<style
@@ -87,15 +64,15 @@
parent="KeyboardView.ICS"
>
<item name="keyPreviewLayout">@layout/key_preview_ics</item>
- <item name="keyPreviewOffset">@dimen/key_preview_offset_ics</item>
+ <item name="keyPreviewOffset">@dimen/key_preview_offset_holo</item>
<item name="gestureFloatingPreviewTextColor">@color/highlight_color_holo</item>
- <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_ics</item>
+ <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
<item name="gestureTrailColor">@color/highlight_color_holo</item>
<item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_holo</item>
<item name="autoCorrectionSpacebarLedEnabled">false</item>
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>
- <item name="spacebarTextColor">@color/spacebar_text_color_ics</item>
- <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_ics</item>
+ <item name="spacebarTextColor">@color/spacebar_text_color_holo</item>
+ <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
</style>
<!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it,
for instance delete button, need themed {@link KeyboardView} attributes. -->
@@ -104,7 +81,7 @@
parent="KeyboardView.ICS"
>
<item name="keyBackgroundEmojiFunctional">@drawable/btn_keyboard_key_functional_ics</item>
- <item name="emojiTabLabelColor">@color/emoji_tab_label_color_ics</item>
+ <item name="emojiTabLabelColor">@color/emoji_tab_label_color_holo</item>
</style>
<style
name="MoreKeysKeyboard.ICS"
@@ -122,7 +99,7 @@
<item name="android:background">@null</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item>
<item name="keyTypeface">normal</item>
- <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_ics</item>
+ <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item>
</style>
<style
name="MoreKeysKeyboardContainer.ICS"
diff --git a/java/res/values/touch-position-correction.xml b/java/res/values/touch-position-correction.xml
index 9df517b..becec0e 100644
--- a/java/res/values/touch-position-correction.xml
+++ b/java/res/values/touch-position-correction.xml
@@ -57,7 +57,7 @@
</string-array>
<string-array
- name="touch_position_correction_data_ics"
+ name="touch_position_correction_data_holo"
translatable="false"
>
<!-- First row -->