Rename LMP to LXX just in case

This CL must be checked in together with I7e2ba67f31.

Change-Id: I51cb982f9cf0ace173d535a60293bb4be83bbb75
main
Tadashi G. Takaoka 2014-05-14 18:31:06 +09:00
parent c1094d6913
commit 3610039723
60 changed files with 92 additions and 92 deletions

View File

@ -29,5 +29,5 @@
android:state_selected="true"
android:color="@color/key_text_color_holo" />
<item
android:color="@color/key_text_inactive_color_lmp" />
android:color="@color/key_text_inactive_color_lxx" />
</selector>

View File

Before

Width:  |  Height:  |  Size: 135 B

After

Width:  |  Height:  |  Size: 135 B

View File

Before

Width:  |  Height:  |  Size: 130 B

After

Width:  |  Height:  |  Size: 130 B

View File

Before

Width:  |  Height:  |  Size: 138 B

After

Width:  |  Height:  |  Size: 138 B

View File

Before

Width:  |  Height:  |  Size: 130 B

After

Width:  |  Height:  |  Size: 130 B

View File

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 272 B

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 871 B

After

Width:  |  Height:  |  Size: 871 B

View File

Before

Width:  |  Height:  |  Size: 120 B

After

Width:  |  Height:  |  Size: 120 B

View File

Before

Width:  |  Height:  |  Size: 114 B

After

Width:  |  Height:  |  Size: 114 B

View File

Before

Width:  |  Height:  |  Size: 124 B

After

Width:  |  Height:  |  Size: 124 B

View File

Before

Width:  |  Height:  |  Size: 114 B

After

Width:  |  Height:  |  Size: 114 B

View File

Before

Width:  |  Height:  |  Size: 222 B

After

Width:  |  Height:  |  Size: 222 B

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 589 B

After

Width:  |  Height:  |  Size: 589 B

View File

Before

Width:  |  Height:  |  Size: 153 B

After

Width:  |  Height:  |  Size: 153 B

View File

Before

Width:  |  Height:  |  Size: 149 B

After

Width:  |  Height:  |  Size: 149 B

View File

Before

Width:  |  Height:  |  Size: 159 B

After

Width:  |  Height:  |  Size: 159 B

View File

Before

Width:  |  Height:  |  Size: 149 B

After

Width:  |  Height:  |  Size: 149 B

View File

Before

Width:  |  Height:  |  Size: 323 B

After

Width:  |  Height:  |  Size: 323 B

View File

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 180 B

After

Width:  |  Height:  |  Size: 180 B

View File

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 182 B

View File

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 182 B

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@ -17,6 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Functional keys. -->
<item android:state_pressed="true"
android:drawable="@color/key_background_pressed_lmp" />
<item android:drawable="@color/key_background_lmp" />
android:drawable="@color/key_background_pressed_lxx" />
<item android:drawable="@color/key_background_lxx" />
</selector>

View File

@ -17,26 +17,26 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Action keys. -->
<item android:state_active="true" android:state_pressed="true"
android:drawable="@color/key_background_pressed_lmp" />
android:drawable="@color/key_background_pressed_lxx" />
<item android:state_active="true"
android:drawable="@color/key_background_lmp" />
android:drawable="@color/key_background_lxx" />
<!-- Toggle keys. Use checkable/checked state. -->
<item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_dark_pressed_on_lmp" />
android:drawable="@drawable/btn_keyboard_key_dark_pressed_on_lxx" />
<item android:state_checkable="true" android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_dark_pressed_off_lmp" />
android:drawable="@drawable/btn_keyboard_key_dark_pressed_off_lxx" />
<item android:state_checkable="true" android:state_checked="true"
android:drawable="@drawable/btn_keyboard_key_dark_normal_on_lmp" />
android:drawable="@drawable/btn_keyboard_key_dark_normal_on_lxx" />
<item android:state_checkable="true"
android:drawable="@drawable/btn_keyboard_key_dark_normal_off_lmp" />
android:drawable="@drawable/btn_keyboard_key_dark_normal_off_lxx" />
<!-- Empty background keys. -->
<item android:state_empty="true"
android:drawable="@color/key_background_lmp" />
android:drawable="@color/key_background_lxx" />
<!-- Normal keys. -->
<item android:state_pressed="true"
android:drawable="@color/key_background_pressed_lmp" />
<item android:drawable="@color/key_background_lmp" />
android:drawable="@color/key_background_pressed_lxx" />
<item android:drawable="@color/key_background_lxx" />
</selector>

View File

@ -16,6 +16,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_popup_selected_lmp" />
android:drawable="@drawable/btn_keyboard_key_popup_selected_lxx" />
<item android:drawable="@android:color/transparent" />
</selector>

View File

@ -16,6 +16,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@color/key_background_pressed_lmp" />
<item android:drawable="@color/key_background_lmp" />
android:drawable="@color/key_background_pressed_lxx" />
<item android:drawable="@color/key_background_lxx" />
</selector>

View File

@ -23,5 +23,5 @@
>
<item
android:state_pressed="true"
android:drawable="@color/suggested_word_background_selected_lmp" />
android:drawable="@color/suggested_word_background_selected_lxx" />
</selector>

View File

@ -20,17 +20,17 @@
>
<!-- Left edge -->
<item latin:state_left_edge="true" latin:state_has_morekeys="true"
android:drawable="@drawable/keyboard_key_feedback_left_more_background_lmp" />
android:drawable="@drawable/keyboard_key_feedback_left_more_background_lxx" />
<item latin:state_left_edge="true"
android:drawable="@drawable/keyboard_key_feedback_left_background_lmp" />
android:drawable="@drawable/keyboard_key_feedback_left_background_lxx" />
<!-- Right edge -->
<item latin:state_right_edge="true" latin:state_has_morekeys="true"
android:drawable="@drawable/keyboard_key_feedback_right_more_background_lmp" />
android:drawable="@drawable/keyboard_key_feedback_right_more_background_lxx" />
<item latin:state_right_edge="true"
android:drawable="@drawable/keyboard_key_feedback_right_background_lmp" />
android:drawable="@drawable/keyboard_key_feedback_right_background_lxx" />
<item latin:state_has_morekeys="true"
android:drawable="@drawable/keyboard_key_feedback_more_background_lmp" />
<item android:drawable="@drawable/keyboard_key_feedback_background_lmp" />
android:drawable="@drawable/keyboard_key_feedback_more_background_lxx" />
<item android:drawable="@drawable/keyboard_key_feedback_background_lxx" />
</selector>

View File

@ -39,18 +39,18 @@
<color name="typed_word_color_klp">#D8F0F0F0</color>
<color name="suggested_word_color_klp">#B2F0F0F0</color>
<color name="highlight_translucent_color_klp">#99E0E0E0</color>
<!-- Color resources for LMP theme. Base color = F0F0F0 -->
<color name="key_text_inactive_color_lmp">#808184</color>
<color name="key_hint_letter_color_lmp">#808184</color>
<color name="highlight_color_lmp">#7FCAC3</color>
<color name="typed_word_color_lmp">#D87FCAC3</color>
<color name="suggested_word_color_lmp">#B27FCAC3</color>
<color name="highlight_translucent_color_lmp">#997FCAC3</color>
<color name="keyboard_background_lmp">#384248</color>
<color name="key_background_lmp">#384248</color>
<color name="key_background_pressed_lmp">#546872</color>
<color name="suggestions_strip_background_lmp">#263238</color>
<color name="suggested_word_background_selected_lmp">#384248</color>
<!-- Color resources for LXX theme. Base color = F0F0F0 -->
<color name="key_text_inactive_color_lxx">#808184</color>
<color name="key_hint_letter_color_lxx">#808184</color>
<color name="highlight_color_lxx">#7FCAC3</color>
<color name="typed_word_color_lxx">#D87FCAC3</color>
<color name="suggested_word_color_lxx">#B27FCAC3</color>
<color name="highlight_translucent_color_lxx">#997FCAC3</color>
<color name="keyboard_background_lxx">#384248</color>
<color name="key_background_lxx">#384248</color>
<color name="key_background_pressed_lxx">#546872</color>
<color name="suggestions_strip_background_lxx">#263238</color>
<color name="suggested_word_background_selected_lxx">#384248</color>
<!-- Color resources for setup wizard and tutorial -->
<color name="setup_background">#FFEBEBEB</color>
<color name="setup_text_dark">#FF707070</color>

View File

@ -19,7 +19,7 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="KeyboardIcons.LMP">
<style name="KeyboardIcons.LXX">
<!-- Keyboard icons -->
<item name="iconShiftKey">@drawable/sym_keyboard_shift_holo_dark</item>
<item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo_dark</item>

View File

@ -19,19 +19,19 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="KeyboardTheme.LMP" parent="KeyboardIcons.LMP">
<item name="keyboardStyle">@style/Keyboard.LMP</item>
<item name="keyboardViewStyle">@style/KeyboardView.LMP</item>
<item name="mainKeyboardViewStyle">@style/MainKeyboardView.LMP</item>
<item name="keyPreviewTextViewStyle">@style/KeyPreviewTextView.LMP</item>
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.LMP</item>
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.LMP</item>
<item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.LMP</item>
<item name="suggestionStripViewStyle">@style/SuggestionStripView.LMP</item>
<item name="suggestionWordStyle">@style/SuggestionWord.LMP</item>
<style name="KeyboardTheme.LXX" parent="KeyboardIcons.LXX">
<item name="keyboardStyle">@style/Keyboard.LXX</item>
<item name="keyboardViewStyle">@style/KeyboardView.LXX</item>
<item name="mainKeyboardViewStyle">@style/MainKeyboardView.LXX</item>
<item name="keyPreviewTextViewStyle">@style/KeyPreviewTextView.LXX</item>
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.LXX</item>
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.LXX</item>
<item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.LXX</item>
<item name="suggestionStripViewStyle">@style/SuggestionStripView.LXX</item>
<item name="suggestionWordStyle">@style/SuggestionWord.LXX</item>
</style>
<style
name="Keyboard.LMP"
name="Keyboard.LXX"
parent="Keyboard"
>
<!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
@ -43,56 +43,56 @@
<item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item>
</style>
<style
name="KeyboardView.LMP"
name="KeyboardView.LXX"
parent="KeyboardView"
>
<item name="android:background">@color/keyboard_background_lmp</item>
<item name="keyBackground">@drawable/btn_keyboard_key_lmp</item>
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lmp</item>
<item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lmp</item>
<item name="android:background">@color/keyboard_background_lxx</item>
<item name="keyBackground">@drawable/btn_keyboard_key_lxx</item>
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx</item>
<item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx</item>
<item name="keyTypeface">bold</item>
<item name="keyTextColor">@color/key_text_color_holo</item>
<item name="keyTextInactivatedColor">@color/key_text_inactive_color_lmp</item>
<item name="keyHintLetterColor">@color/key_hint_letter_color_lmp</item>
<item name="keyHintLabelColor">@color/key_text_inactive_color_lmp</item>
<item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lmp</item>
<item name="keyTextInactivatedColor">@color/key_text_inactive_color_lxx</item>
<item name="keyHintLetterColor">@color/key_hint_letter_color_lxx</item>
<item name="keyHintLabelColor">@color/key_text_inactive_color_lxx</item>
<item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx</item>
<item name="keyShiftedLetterHintActivatedColor">@color/key_text_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>
</style>
<style
name="MainKeyboardView.LMP"
parent="KeyboardView.LMP"
name="MainKeyboardView.LXX"
parent="KeyboardView.LXX"
>
<item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
<item name="gestureFloatingPreviewTextColor">@color/highlight_color_lmp</item>
<item name="gestureFloatingPreviewTextColor">@color/highlight_color_lxx</item>
<item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
<item name="gestureTrailColor">@color/highlight_color_lmp</item>
<item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_lmp</item>
<item name="gestureTrailColor">@color/highlight_color_lxx</item>
<item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_lxx</item>
<item name="autoCorrectionSpacebarLedEnabled">false</item>
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>
<item name="languageOnSpacebarTextColor">@color/key_text_inactive_color_lmp</item>
<item name="languageOnSpacebarTextColor">@color/key_text_inactive_color_lxx</item>
<!-- A negative value to disable text shadow layer. -->
<item name="languageOnSpacebarTextShadowRadius">-1.0</item>
</style>
<style
name="KeyPreviewTextView.LMP"
name="KeyPreviewTextView.LXX"
parent="KeyPreviewTextView"
>
<item name="android:background">@drawable/keyboard_key_feedback_lmp</item>
<item name="android:background">@drawable/keyboard_key_feedback_lxx</item>
</style>
<!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it,
for instance delete button, need themed {@link KeyboardView} attributes. -->
<style
name="EmojiPalettesView.LMP"
parent="MainKeyboardView.LMP"
name="EmojiPalettesView.LXX"
parent="MainKeyboardView.LXX"
>
<item name="emojiTabLabelColor">@color/emoji_tab_label_color_lmp</item>
<item name="emojiTabLabelColor">@color/emoji_tab_label_color_lxx</item>
</style>
<style
name="MoreKeysKeyboard.LMP"
parent="Keyboard.LMP"
name="MoreKeysKeyboard.LXX"
parent="Keyboard.LXX"
>
<item name="keyboardTopPadding">0%p</item>
<item name="keyboardBottomPadding">0%p</item>
@ -100,17 +100,17 @@
<item name="touchPositionCorrectionData">@null</item>
</style>
<style
name="MoreKeysKeyboardView.LMP"
parent="KeyboardView.LMP"
name="MoreKeysKeyboardView.LXX"
parent="KeyboardView.LXX"
>
<item name="android:background">@drawable/keyboard_popup_panel_background_lmp</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_lmp</item>
<item name="android:background">@drawable/keyboard_popup_panel_background_lxx</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_lxx</item>
<item name="keyTypeface">normal</item>
<item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
</style>
<style
name="SuggestionStripView.LMP"
parent="KeyboardView.LMP"
name="SuggestionStripView.LXX"
parent="KeyboardView.LXX"
>
<item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>
<item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
@ -118,17 +118,17 @@
<item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
<item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
<item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
<item name="colorValidTypedWord">@color/typed_word_color_lmp</item>
<item name="colorTypedWord">@color/typed_word_color_lmp</item>
<item name="colorAutoCorrect">@color/highlight_color_lmp</item>
<item name="colorSuggested">@color/suggested_word_color_lmp</item>
<item name="colorValidTypedWord">@color/typed_word_color_lxx</item>
<item name="colorTypedWord">@color/typed_word_color_lxx</item>
<item name="colorAutoCorrect">@color/highlight_color_lxx</item>
<item name="colorSuggested">@color/suggested_word_color_lxx</item>
<item name="alphaObsoleted">70%</item>
</style>
<style
name="SuggestionWord.LMP"
name="SuggestionWord.LXX"
parent="SuggestionWord"
>
<item name="android:background">@drawable/btn_suggestion_lmp</item>
<item name="android:textColor">@color/highlight_color_lmp</item>
<item name="android:background">@drawable/btn_suggestion_lxx</item>
<item name="android:textColor">@color/highlight_color_lxx</item>
</style>
</resources>

View File

@ -34,7 +34,7 @@ public final class KeyboardTheme {
static final int THEME_ID_ICS = 0;
static final int THEME_ID_KLP = 2;
static final int THEME_ID_LMP = 3;
static final int THEME_ID_LXX = 3;
static final int DEFAULT_THEME_ID = THEME_ID_KLP;
private static final KeyboardTheme[] KEYBOARD_THEMES = {
@ -42,7 +42,7 @@ public final class KeyboardTheme {
VERSION_CODES.ICE_CREAM_SANDWICH),
new KeyboardTheme(THEME_ID_KLP, R.style.KeyboardTheme_KLP,
VERSION_CODES.KITKAT),
new KeyboardTheme(THEME_ID_LMP, R.style.KeyboardTheme_LMP,
new KeyboardTheme(THEME_ID_LXX, R.style.KeyboardTheme_LXX,
// TODO: Update this constant once the *next* version becomes available.
VERSION_CODES.CUR_DEVELOPMENT),
};
@ -88,7 +88,7 @@ public final class KeyboardTheme {
return 5;
case THEME_ID_KLP:
return 9;
case THEME_ID_LMP:
case THEME_ID_LXX:
return 10;
default: // Invalid theme
return -1;

View File

@ -29,7 +29,7 @@ public class KeyboardThemeTests extends AndroidTestCase {
private static final int THEME_ID_NULL = -1;
private static final int THEME_ID_ICS = KeyboardTheme.THEME_ID_ICS;
private static final int THEME_ID_KLP = KeyboardTheme.THEME_ID_KLP;
private static final int THEME_ID_LMP = KeyboardTheme.THEME_ID_LMP;
private static final int THEME_ID_LXX = KeyboardTheme.THEME_ID_LXX;
@Override
protected void setUp() throws Exception {
@ -64,11 +64,11 @@ public class KeyboardThemeTests extends AndroidTestCase {
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_KLP, THEME_ID_KLP);
}
private void assertDefaultKeyboardThemeLMP(final int sdkVersion) {
// Forced to switch to LMP theme.
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_NULL, THEME_ID_LMP);
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_ICS, THEME_ID_LMP);
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_KLP, THEME_ID_LMP);
private void assertDefaultKeyboardThemeLXX(final int sdkVersion) {
// Forced to switch to LXX theme.
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_NULL, THEME_ID_LXX);
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_ICS, THEME_ID_LXX);
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_KLP, THEME_ID_LXX);
}
public void testDefaultKeyboardThemeICS() {
@ -86,8 +86,8 @@ public class KeyboardThemeTests extends AndroidTestCase {
assertDefaultKeyboardThemeKLP(VERSION_CODES.KITKAT);
}
public void testDefaultKeyboardThemeLMP() {
public void testDefaultKeyboardThemeLXX() {
// TODO: Update this constant once the *next* version becomes available.
assertDefaultKeyboardThemeLMP(VERSION_CODES.CUR_DEVELOPMENT);
assertDefaultKeyboardThemeLXX(VERSION_CODES.CUR_DEVELOPMENT);
}
}