Merge "Rename LXX theme to LXX_Dark"
Tadashi G. Takaoka
Android (Google) Code Review
|
|
@ -21,13 +21,13 @@
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<item
|
<item
|
||||||
android:state_focused="true"
|
android:state_focused="true"
|
||||||
android:color="@color/key_text_color_holo" />
|
android:color="@color/key_text_color_lxx_dark" />
|
||||||
<item
|
<item
|
||||||
android:state_pressed="true"
|
android:state_pressed="true"
|
||||||
android:color="@color/key_text_color_holo" />
|
android:color="@color/key_text_color_lxx_dark" />
|
||||||
<item
|
<item
|
||||||
android:state_selected="true"
|
android:state_selected="true"
|
||||||
android:color="@color/key_text_color_holo" />
|
android:color="@color/key_text_color_lxx_dark" />
|
||||||
<item
|
<item
|
||||||
android:color="@color/key_text_inactive_color_lxx" />
|
android:color="@color/key_text_inactive_color_lxx_dark" />
|
||||||
</selector>
|
</selector>
|
||||||
|
Before Width: | Height: | Size: 135 B After Width: | Height: | Size: 135 B |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 130 B |
|
Before Width: | Height: | Size: 138 B After Width: | Height: | Size: 138 B |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 130 B |
|
Before Width: | Height: | Size: 272 B After Width: | Height: | Size: 272 B |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 871 B After Width: | Height: | Size: 871 B |
|
Before Width: | Height: | Size: 120 B After Width: | Height: | Size: 120 B |
|
Before Width: | Height: | Size: 114 B After Width: | Height: | Size: 114 B |
|
Before Width: | Height: | Size: 124 B After Width: | Height: | Size: 124 B |
|
Before Width: | Height: | Size: 114 B After Width: | Height: | Size: 114 B |
|
Before Width: | Height: | Size: 222 B After Width: | Height: | Size: 222 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 589 B After Width: | Height: | Size: 589 B |
|
Before Width: | Height: | Size: 153 B After Width: | Height: | Size: 153 B |
|
Before Width: | Height: | Size: 149 B After Width: | Height: | Size: 149 B |
|
Before Width: | Height: | Size: 159 B After Width: | Height: | Size: 159 B |
|
Before Width: | Height: | Size: 149 B After Width: | Height: | Size: 149 B |
|
Before Width: | Height: | Size: 323 B After Width: | Height: | Size: 323 B |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 180 B After Width: | Height: | Size: 180 B |
|
Before Width: | Height: | Size: 182 B After Width: | Height: | Size: 182 B |
|
Before Width: | Height: | Size: 186 B After Width: | Height: | Size: 186 B |
|
Before Width: | Height: | Size: 182 B After Width: | Height: | Size: 182 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 5.9 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
|
|
@ -17,6 +17,6 @@
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<!-- Functional keys. -->
|
<!-- Functional keys. -->
|
||||||
<item android:state_pressed="true"
|
<item android:state_pressed="true"
|
||||||
android:drawable="@color/key_background_pressed_lxx" />
|
android:drawable="@color/key_background_pressed_lxx_dark" />
|
||||||
<item android:drawable="@color/key_background_lxx" />
|
<item android:drawable="@color/key_background_lxx_dark" />
|
||||||
</selector>
|
</selector>
|
||||||
|
|
@ -17,26 +17,26 @@
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<!-- Action keys. -->
|
<!-- Action keys. -->
|
||||||
<item android:state_active="true" android:state_pressed="true"
|
<item android:state_active="true" android:state_pressed="true"
|
||||||
android:drawable="@color/key_background_pressed_lxx" />
|
android:drawable="@color/key_background_pressed_lxx_dark" />
|
||||||
<item android:state_active="true"
|
<item android:state_active="true"
|
||||||
android:drawable="@color/key_background_lxx" />
|
android:drawable="@color/key_background_lxx_dark" />
|
||||||
|
|
||||||
<!-- Toggle keys. Use checkable/checked state. -->
|
<!-- Toggle keys. Use checkable/checked state. -->
|
||||||
<item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
|
<item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
|
||||||
android:drawable="@drawable/btn_keyboard_key_dark_pressed_on_lxx" />
|
android:drawable="@drawable/btn_keyboard_key_dark_pressed_on_lxx_dark" />
|
||||||
<item android:state_checkable="true" android:state_pressed="true"
|
<item android:state_checkable="true" android:state_pressed="true"
|
||||||
android:drawable="@drawable/btn_keyboard_key_dark_pressed_off_lxx" />
|
android:drawable="@drawable/btn_keyboard_key_dark_pressed_off_lxx_dark" />
|
||||||
<item android:state_checkable="true" android:state_checked="true"
|
<item android:state_checkable="true" android:state_checked="true"
|
||||||
android:drawable="@drawable/btn_keyboard_key_dark_normal_on_lxx" />
|
android:drawable="@drawable/btn_keyboard_key_dark_normal_on_lxx_dark" />
|
||||||
<item android:state_checkable="true"
|
<item android:state_checkable="true"
|
||||||
android:drawable="@drawable/btn_keyboard_key_dark_normal_off_lxx" />
|
android:drawable="@drawable/btn_keyboard_key_dark_normal_off_lxx_dark" />
|
||||||
|
|
||||||
<!-- Empty background keys. -->
|
<!-- Empty background keys. -->
|
||||||
<item android:state_empty="true"
|
<item android:state_empty="true"
|
||||||
android:drawable="@color/key_background_lxx" />
|
android:drawable="@color/key_background_lxx_dark" />
|
||||||
|
|
||||||
<!-- Normal keys. -->
|
<!-- Normal keys. -->
|
||||||
<item android:state_pressed="true"
|
<item android:state_pressed="true"
|
||||||
android:drawable="@color/key_background_pressed_lxx" />
|
android:drawable="@color/key_background_pressed_lxx_dark" />
|
||||||
<item android:drawable="@color/key_background_lxx" />
|
<item android:drawable="@color/key_background_lxx_dark" />
|
||||||
</selector>
|
</selector>
|
||||||
|
|
@ -16,6 +16,6 @@
|
||||||
|
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<item android:state_pressed="true"
|
<item android:state_pressed="true"
|
||||||
android:drawable="@drawable/btn_keyboard_key_popup_selected_lxx" />
|
android:drawable="@drawable/btn_keyboard_key_popup_selected_lxx_dark" />
|
||||||
<item android:drawable="@android:color/transparent" />
|
<item android:drawable="@android:color/transparent" />
|
||||||
</selector>
|
</selector>
|
||||||
|
|
@ -16,6 +16,6 @@
|
||||||
|
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<item android:state_pressed="true"
|
<item android:state_pressed="true"
|
||||||
android:drawable="@color/key_background_pressed_lxx" />
|
android:drawable="@color/key_background_pressed_lxx_dark" />
|
||||||
<item android:drawable="@color/key_background_lxx" />
|
<item android:drawable="@color/key_background_lxx_dark" />
|
||||||
</selector>
|
</selector>
|
||||||
|
|
@ -23,5 +23,5 @@
|
||||||
>
|
>
|
||||||
<item
|
<item
|
||||||
android:state_pressed="true"
|
android:state_pressed="true"
|
||||||
android:drawable="@color/suggested_word_background_selected_lxx" />
|
android:drawable="@color/suggested_word_background_selected_lxx_dark" />
|
||||||
</selector>
|
</selector>
|
||||||
|
|
@ -20,17 +20,17 @@
|
||||||
>
|
>
|
||||||
<!-- Left edge -->
|
<!-- Left edge -->
|
||||||
<item latin:state_left_edge="true" latin:state_has_morekeys="true"
|
<item latin:state_left_edge="true" latin:state_has_morekeys="true"
|
||||||
android:drawable="@drawable/keyboard_key_feedback_left_more_background_lxx" />
|
android:drawable="@drawable/keyboard_key_feedback_left_more_background_lxx_dark" />
|
||||||
<item latin:state_left_edge="true"
|
<item latin:state_left_edge="true"
|
||||||
android:drawable="@drawable/keyboard_key_feedback_left_background_lxx" />
|
android:drawable="@drawable/keyboard_key_feedback_left_background_lxx_dark" />
|
||||||
|
|
||||||
<!-- Right edge -->
|
<!-- Right edge -->
|
||||||
<item latin:state_right_edge="true" latin:state_has_morekeys="true"
|
<item latin:state_right_edge="true" latin:state_has_morekeys="true"
|
||||||
android:drawable="@drawable/keyboard_key_feedback_right_more_background_lxx" />
|
android:drawable="@drawable/keyboard_key_feedback_right_more_background_lxx_dark" />
|
||||||
<item latin:state_right_edge="true"
|
<item latin:state_right_edge="true"
|
||||||
android:drawable="@drawable/keyboard_key_feedback_right_background_lxx" />
|
android:drawable="@drawable/keyboard_key_feedback_right_background_lxx_dark" />
|
||||||
|
|
||||||
<item latin:state_has_morekeys="true"
|
<item latin:state_has_morekeys="true"
|
||||||
android:drawable="@drawable/keyboard_key_feedback_more_background_lxx" />
|
android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_dark" />
|
||||||
<item android:drawable="@drawable/keyboard_key_feedback_background_lxx" />
|
<item android:drawable="@drawable/keyboard_key_feedback_background_lxx_dark" />
|
||||||
</selector>
|
</selector>
|
||||||
|
|
@ -40,17 +40,19 @@
|
||||||
<color name="suggested_word_color_klp">#B2F0F0F0</color>
|
<color name="suggested_word_color_klp">#B2F0F0F0</color>
|
||||||
<color name="highlight_translucent_color_klp">#99E0E0E0</color>
|
<color name="highlight_translucent_color_klp">#99E0E0E0</color>
|
||||||
<!-- Color resources for LXX theme. Base color = F0F0F0 -->
|
<!-- Color resources for LXX theme. Base color = F0F0F0 -->
|
||||||
<color name="key_text_inactive_color_lxx">#808184</color>
|
<color name="key_text_color_lxx_dark">#FFFFFF</color>
|
||||||
<color name="key_hint_letter_color_lxx">#808184</color>
|
<color name="key_text_inactive_color_lxx_dark">#808184</color>
|
||||||
<color name="highlight_color_lxx">#7FCAC3</color>
|
<color name="key_hint_letter_color_lxx_dark">#808184</color>
|
||||||
<color name="typed_word_color_lxx">#D87FCAC3</color>
|
<color name="highlight_color_lxx_dark">#7FCAC3</color>
|
||||||
<color name="suggested_word_color_lxx">#B27FCAC3</color>
|
<color name="typed_word_color_lxx_dark">#D87FCAC3</color>
|
||||||
<color name="highlight_translucent_color_lxx">#997FCAC3</color>
|
<color name="suggested_word_color_lxx_dark">#B27FCAC3</color>
|
||||||
<color name="keyboard_background_lxx">#384248</color>
|
<color name="highlight_translucent_color_lxx_dark">#997FCAC3</color>
|
||||||
<color name="key_background_lxx">#384248</color>
|
<color name="keyboard_background_lxx_dark">#384248</color>
|
||||||
<color name="key_background_pressed_lxx">#546872</color>
|
<color name="key_background_lxx_dark">#384248</color>
|
||||||
<color name="suggestions_strip_background_lxx">#263238</color>
|
<color name="key_background_pressed_lxx_dark">#546872</color>
|
||||||
<color name="suggested_word_background_selected_lxx">#384248</color>
|
<color name="suggestions_strip_background_lxx_dark">#263238</color>
|
||||||
|
<color name="suggested_word_background_selected_lxx_dark">#384248</color>
|
||||||
|
<color name="gesture_floating_preview_color_lxx_dark">#C0000000</color>
|
||||||
<!-- Color resources for setup wizard and tutorial -->
|
<!-- Color resources for setup wizard and tutorial -->
|
||||||
<color name="setup_background">#FFEBEBEB</color>
|
<color name="setup_background">#FFEBEBEB</color>
|
||||||
<color name="setup_text_dark">#FF707070</color>
|
<color name="setup_text_dark">#FF707070</color>
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<style name="KeyboardIcons.LXX">
|
<style name="KeyboardIcons.LXX_Dark">
|
||||||
<!-- Keyboard icons -->
|
<!-- Keyboard icons -->
|
||||||
<!-- TODO: Update those icons for LXX theme. -->
|
<!-- TODO: Update those icons for LXX theme. -->
|
||||||
<item name="iconShiftKey">@drawable/sym_keyboard_shift_holo_dark</item>
|
<item name="iconShiftKey">@drawable/sym_keyboard_shift_holo_dark</item>
|
||||||
|
|
@ -19,19 +19,19 @@
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<style name="KeyboardTheme.LXX" parent="KeyboardIcons.LXX">
|
<style name="KeyboardTheme.LXX_Dark" parent="KeyboardIcons.LXX_Dark">
|
||||||
<item name="keyboardStyle">@style/Keyboard.LXX</item>
|
<item name="keyboardStyle">@style/Keyboard.LXX_Dark</item>
|
||||||
<item name="keyboardViewStyle">@style/KeyboardView.LXX</item>
|
<item name="keyboardViewStyle">@style/KeyboardView.LXX_Dark</item>
|
||||||
<item name="mainKeyboardViewStyle">@style/MainKeyboardView.LXX</item>
|
<item name="mainKeyboardViewStyle">@style/MainKeyboardView.LXX_Dark</item>
|
||||||
<item name="keyPreviewTextViewStyle">@style/KeyPreviewTextView.LXX</item>
|
<item name="keyPreviewTextViewStyle">@style/KeyPreviewTextView.LXX_Dark</item>
|
||||||
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.LXX</item>
|
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.LXX_Dark</item>
|
||||||
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.LXX</item>
|
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.LXX_Dark</item>
|
||||||
<item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.LXX</item>
|
<item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.LXX_Dark</item>
|
||||||
<item name="suggestionStripViewStyle">@style/SuggestionStripView.LXX</item>
|
<item name="suggestionStripViewStyle">@style/SuggestionStripView.LXX_Dark</item>
|
||||||
<item name="suggestionWordStyle">@style/SuggestionWord.LXX</item>
|
<item name="suggestionWordStyle">@style/SuggestionWord.LXX_Dark</item>
|
||||||
</style>
|
</style>
|
||||||
<style
|
<style
|
||||||
name="Keyboard.LXX"
|
name="Keyboard.LXX_Dark"
|
||||||
parent="Keyboard"
|
parent="Keyboard"
|
||||||
>
|
>
|
||||||
<!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
|
<!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
|
||||||
|
|
@ -43,56 +43,56 @@
|
||||||
<item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item>
|
<item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item>
|
||||||
</style>
|
</style>
|
||||||
<style
|
<style
|
||||||
name="KeyboardView.LXX"
|
name="KeyboardView.LXX_Dark"
|
||||||
parent="KeyboardView"
|
parent="KeyboardView"
|
||||||
>
|
>
|
||||||
<item name="android:background">@color/keyboard_background_lxx</item>
|
<item name="android:background">@color/keyboard_background_lxx_dark</item>
|
||||||
<item name="keyBackground">@drawable/btn_keyboard_key_lxx</item>
|
<item name="keyBackground">@drawable/btn_keyboard_key_lxx_dark</item>
|
||||||
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx</item>
|
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_dark</item>
|
||||||
<item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx</item>
|
<item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_dark</item>
|
||||||
<item name="spacebarIconWidthRatio">0.9</item>
|
<item name="spacebarIconWidthRatio">0.9</item>
|
||||||
<item name="keyTypeface">normal</item>
|
<item name="keyTypeface">normal</item>
|
||||||
<item name="keyTextColor">@color/key_text_color_holo</item>
|
<item name="keyTextColor">@color/key_text_color_lxx_dark</item>
|
||||||
<item name="keyTextInactivatedColor">@color/key_text_inactive_color_lxx</item>
|
<item name="keyTextInactivatedColor">@color/key_text_inactive_color_lxx_dark</item>
|
||||||
<item name="functionalTextColor">@color/key_hint_letter_color_lxx</item>
|
<item name="functionalTextColor">@color/key_hint_letter_color_lxx_dark</item>
|
||||||
<item name="keyHintLetterColor">@color/key_hint_letter_color_lxx</item>
|
<item name="keyHintLetterColor">@color/key_hint_letter_color_lxx_dark</item>
|
||||||
<item name="keyHintLabelColor">@color/key_text_inactive_color_lxx</item>
|
<item name="keyHintLabelColor">@color/key_text_inactive_color_lxx_dark</item>
|
||||||
<item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx</item>
|
<item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_dark</item>
|
||||||
<item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_holo</item>
|
<item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_lxx_dark</item>
|
||||||
<item name="keyPreviewTextColor">@color/key_text_color_holo</item>
|
<item name="keyPreviewTextColor">@color/key_text_color_lxx_dark</item>
|
||||||
<!-- A negative value to disable key text shadow layer. -->
|
<!-- A negative value to disable key text shadow layer. -->
|
||||||
<item name="keyTextShadowRadius">-1.0</item>
|
<item name="keyTextShadowRadius">-1.0</item>
|
||||||
</style>
|
</style>
|
||||||
<style
|
<style
|
||||||
name="MainKeyboardView.LXX"
|
name="MainKeyboardView.LXX_Dark"
|
||||||
parent="KeyboardView.LXX"
|
parent="KeyboardView.LXX_Dark"
|
||||||
>
|
>
|
||||||
<item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
|
<item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
|
||||||
<item name="gestureFloatingPreviewTextColor">@color/highlight_color_lxx</item>
|
<item name="gestureFloatingPreviewTextColor">@color/highlight_color_lxx_dark</item>
|
||||||
<item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
|
<item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_lxx_dark</item>
|
||||||
<item name="gestureTrailColor">@color/highlight_color_lxx</item>
|
<item name="gestureTrailColor">@color/highlight_color_lxx_dark</item>
|
||||||
<item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_lxx</item>
|
<item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_lxx_dark</item>
|
||||||
<item name="languageOnSpacebarTextColor">@color/key_text_inactive_color_lxx</item>
|
<item name="languageOnSpacebarTextColor">@color/key_text_inactive_color_lxx_dark</item>
|
||||||
<!-- A negative value to disable text shadow layer. -->
|
<!-- A negative value to disable text shadow layer. -->
|
||||||
<item name="languageOnSpacebarTextShadowRadius">-1.0</item>
|
<item name="languageOnSpacebarTextShadowRadius">-1.0</item>
|
||||||
</style>
|
</style>
|
||||||
<style
|
<style
|
||||||
name="KeyPreviewTextView.LXX"
|
name="KeyPreviewTextView.LXX_Dark"
|
||||||
parent="KeyPreviewTextView"
|
parent="KeyPreviewTextView"
|
||||||
>
|
>
|
||||||
<item name="android:background">@drawable/keyboard_key_feedback_lxx</item>
|
<item name="android:background">@drawable/keyboard_key_feedback_lxx_dark</item>
|
||||||
</style>
|
</style>
|
||||||
<!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it,
|
<!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it,
|
||||||
for instance delete button, need themed {@link KeyboardView} attributes. -->
|
for instance delete button, need themed {@link KeyboardView} attributes. -->
|
||||||
<style
|
<style
|
||||||
name="EmojiPalettesView.LXX"
|
name="EmojiPalettesView.LXX_Dark"
|
||||||
parent="MainKeyboardView.LXX"
|
parent="MainKeyboardView.LXX_Dark"
|
||||||
>
|
>
|
||||||
<item name="emojiTabLabelColor">@color/emoji_tab_label_color_lxx</item>
|
<item name="emojiTabLabelColor">@color/emoji_tab_label_color_lxx_dark</item>
|
||||||
</style>
|
</style>
|
||||||
<style
|
<style
|
||||||
name="MoreKeysKeyboard.LXX"
|
name="MoreKeysKeyboard.LXX_Dark"
|
||||||
parent="Keyboard.LXX"
|
parent="Keyboard.LXX_Dark"
|
||||||
>
|
>
|
||||||
<item name="keyboardTopPadding">0%p</item>
|
<item name="keyboardTopPadding">0%p</item>
|
||||||
<item name="keyboardBottomPadding">0%p</item>
|
<item name="keyboardBottomPadding">0%p</item>
|
||||||
|
|
@ -100,35 +100,35 @@
|
||||||
<item name="touchPositionCorrectionData">@null</item>
|
<item name="touchPositionCorrectionData">@null</item>
|
||||||
</style>
|
</style>
|
||||||
<style
|
<style
|
||||||
name="MoreKeysKeyboardView.LXX"
|
name="MoreKeysKeyboardView.LXX_Dark"
|
||||||
parent="KeyboardView.LXX"
|
parent="KeyboardView.LXX_Dark"
|
||||||
>
|
>
|
||||||
<item name="android:background">@drawable/keyboard_popup_panel_background_lxx</item>
|
<item name="android:background">@drawable/keyboard_popup_panel_background_lxx_dark</item>
|
||||||
<item name="keyBackground">@drawable/btn_keyboard_key_popup_lxx</item>
|
<item name="keyBackground">@drawable/btn_keyboard_key_popup_lxx_dark</item>
|
||||||
<item name="keyTypeface">normal</item>
|
<item name="keyTypeface">normal</item>
|
||||||
<item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
|
<item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
|
||||||
</style>
|
</style>
|
||||||
<style
|
<style
|
||||||
name="SuggestionStripView.LXX"
|
name="SuggestionStripView.LXX_Dark"
|
||||||
parent="KeyboardView.LXX"
|
parent="KeyboardView.LXX_Dark"
|
||||||
>
|
>
|
||||||
<item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>
|
<item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>
|
||||||
<item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
|
<item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
|
||||||
<item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
|
<item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
|
||||||
<item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
|
<item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
|
||||||
<item name="android:background">@color/suggestions_strip_background_lxx</item>
|
<item name="android:background">@color/suggestions_strip_background_lxx_dark</item>
|
||||||
<item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
|
<item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
|
||||||
<item name="colorValidTypedWord">@color/typed_word_color_lxx</item>
|
<item name="colorValidTypedWord">@color/typed_word_color_lxx_dark</item>
|
||||||
<item name="colorTypedWord">@color/typed_word_color_lxx</item>
|
<item name="colorTypedWord">@color/typed_word_color_lxx_dark</item>
|
||||||
<item name="colorAutoCorrect">@color/highlight_color_lxx</item>
|
<item name="colorAutoCorrect">@color/highlight_color_lxx_dark</item>
|
||||||
<item name="colorSuggested">@color/suggested_word_color_lxx</item>
|
<item name="colorSuggested">@color/suggested_word_color_lxx_dark</item>
|
||||||
<item name="alphaObsoleted">70%</item>
|
<item name="alphaObsoleted">70%</item>
|
||||||
</style>
|
</style>
|
||||||
<style
|
<style
|
||||||
name="SuggestionWord.LXX"
|
name="SuggestionWord.LXX_Dark"
|
||||||
parent="SuggestionWord"
|
parent="SuggestionWord"
|
||||||
>
|
>
|
||||||
<item name="android:background">@drawable/btn_suggestion_lxx</item>
|
<item name="android:background">@drawable/btn_suggestion_lxx_dark</item>
|
||||||
<item name="android:textColor">@color/highlight_color_lxx</item>
|
<item name="android:textColor">@color/highlight_color_lxx_dark</item>
|
||||||
</style>
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
@ -34,7 +34,7 @@ public final class KeyboardTheme {
|
||||||
|
|
||||||
static final int THEME_ID_ICS = 0;
|
static final int THEME_ID_ICS = 0;
|
||||||
static final int THEME_ID_KLP = 2;
|
static final int THEME_ID_KLP = 2;
|
||||||
static final int THEME_ID_LXX = 3;
|
static final int THEME_ID_LXX_DARK = 3;
|
||||||
static final int DEFAULT_THEME_ID = THEME_ID_KLP;
|
static final int DEFAULT_THEME_ID = THEME_ID_KLP;
|
||||||
|
|
||||||
private static final KeyboardTheme[] KEYBOARD_THEMES = {
|
private static final KeyboardTheme[] KEYBOARD_THEMES = {
|
||||||
|
|
@ -42,7 +42,7 @@ public final class KeyboardTheme {
|
||||||
VERSION_CODES.BASE),
|
VERSION_CODES.BASE),
|
||||||
new KeyboardTheme(THEME_ID_KLP, R.style.KeyboardTheme_KLP,
|
new KeyboardTheme(THEME_ID_KLP, R.style.KeyboardTheme_KLP,
|
||||||
VERSION_CODES.ICE_CREAM_SANDWICH),
|
VERSION_CODES.ICE_CREAM_SANDWICH),
|
||||||
new KeyboardTheme(THEME_ID_LXX, R.style.KeyboardTheme_LXX,
|
new KeyboardTheme(THEME_ID_LXX_DARK, R.style.KeyboardTheme_LXX_Dark,
|
||||||
// TODO: Update this constant once the *next* version becomes available.
|
// TODO: Update this constant once the *next* version becomes available.
|
||||||
VERSION_CODES.CUR_DEVELOPMENT),
|
VERSION_CODES.CUR_DEVELOPMENT),
|
||||||
};
|
};
|
||||||
|
|
@ -88,7 +88,7 @@ public final class KeyboardTheme {
|
||||||
return 5;
|
return 5;
|
||||||
case THEME_ID_KLP:
|
case THEME_ID_KLP:
|
||||||
return 9;
|
return 9;
|
||||||
case THEME_ID_LXX:
|
case THEME_ID_LXX_DARK:
|
||||||
return 10;
|
return 10;
|
||||||
default: // Invalid theme
|
default: // Invalid theme
|
||||||
return -1;
|
return -1;
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ public class KeyboardThemeTests extends AndroidTestCase {
|
||||||
private static final String ILLEGAL_THEME_ID_STRING = "ThisCausesNumberFormatExecption";
|
private static final String ILLEGAL_THEME_ID_STRING = "ThisCausesNumberFormatExecption";
|
||||||
private static final int THEME_ID_ICS = KeyboardTheme.THEME_ID_ICS;
|
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_KLP = KeyboardTheme.THEME_ID_KLP;
|
||||||
private static final int THEME_ID_LXX = KeyboardTheme.THEME_ID_LXX;
|
private static final int THEME_ID_LXX_DARK = KeyboardTheme.THEME_ID_LXX_DARK;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void setUp() throws Exception {
|
protected void setUp() throws Exception {
|
||||||
|
|
@ -51,7 +51,7 @@ public class KeyboardThemeTests extends AndroidTestCase {
|
||||||
switch (themeId) {
|
switch (themeId) {
|
||||||
case THEME_ID_ICS:
|
case THEME_ID_ICS:
|
||||||
case THEME_ID_KLP:
|
case THEME_ID_KLP:
|
||||||
case THEME_ID_LXX:
|
case THEME_ID_LXX_DARK:
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -95,7 +95,7 @@ public class KeyboardThemeTests extends AndroidTestCase {
|
||||||
assertKeyboardThemePreference(sdkVersion, THEME_ID_NULL, defaultThemeId);
|
assertKeyboardThemePreference(sdkVersion, THEME_ID_NULL, defaultThemeId);
|
||||||
assertKeyboardThemePreference(sdkVersion, THEME_ID_ICS, THEME_ID_ICS);
|
assertKeyboardThemePreference(sdkVersion, THEME_ID_ICS, THEME_ID_ICS);
|
||||||
assertKeyboardThemePreference(sdkVersion, THEME_ID_KLP, THEME_ID_KLP);
|
assertKeyboardThemePreference(sdkVersion, THEME_ID_KLP, THEME_ID_KLP);
|
||||||
assertKeyboardThemePreference(sdkVersion, THEME_ID_LXX, THEME_ID_LXX);
|
assertKeyboardThemePreference(sdkVersion, THEME_ID_LXX_DARK, THEME_ID_LXX_DARK);
|
||||||
assertKeyboardThemePreference(sdkVersion, THEME_ID_UNKNOWN, defaultThemeId);
|
assertKeyboardThemePreference(sdkVersion, THEME_ID_UNKNOWN, defaultThemeId);
|
||||||
assertKeyboardThemePreference(sdkVersion, THEME_ID_ILLEGAL, defaultThemeId);
|
assertKeyboardThemePreference(sdkVersion, THEME_ID_ILLEGAL, defaultThemeId);
|
||||||
}
|
}
|
||||||
|
|
@ -110,11 +110,11 @@ public class KeyboardThemeTests extends AndroidTestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void assertKeyboardThemePreferenceOnLxx(final int sdkVersion) {
|
private void assertKeyboardThemePreferenceOnLxx(final int sdkVersion) {
|
||||||
final int defaultThemeId = THEME_ID_LXX;
|
final int defaultThemeId = THEME_ID_LXX_DARK;
|
||||||
assertKeyboardThemePreference(sdkVersion, THEME_ID_NULL, defaultThemeId);
|
assertKeyboardThemePreference(sdkVersion, THEME_ID_NULL, defaultThemeId);
|
||||||
assertKeyboardThemePreference(sdkVersion, THEME_ID_ICS, THEME_ID_ICS);
|
assertKeyboardThemePreference(sdkVersion, THEME_ID_ICS, THEME_ID_ICS);
|
||||||
assertKeyboardThemePreference(sdkVersion, THEME_ID_KLP, THEME_ID_KLP);
|
assertKeyboardThemePreference(sdkVersion, THEME_ID_KLP, THEME_ID_KLP);
|
||||||
assertKeyboardThemePreference(sdkVersion, THEME_ID_LXX, THEME_ID_LXX);
|
assertKeyboardThemePreference(sdkVersion, THEME_ID_LXX_DARK, THEME_ID_LXX_DARK);
|
||||||
assertKeyboardThemePreference(sdkVersion, THEME_ID_UNKNOWN, defaultThemeId);
|
assertKeyboardThemePreference(sdkVersion, THEME_ID_UNKNOWN, defaultThemeId);
|
||||||
assertKeyboardThemePreference(sdkVersion, THEME_ID_ILLEGAL, defaultThemeId);
|
assertKeyboardThemePreference(sdkVersion, THEME_ID_ILLEGAL, defaultThemeId);
|
||||||
}
|
}
|
||||||
|
|
@ -165,11 +165,11 @@ public class KeyboardThemeTests extends AndroidTestCase {
|
||||||
|
|
||||||
private void assertDefaultKeyboardThemeOnLxx(final int sdkVersion) {
|
private void assertDefaultKeyboardThemeOnLxx(final int sdkVersion) {
|
||||||
// Forced to switch to LXX theme.
|
// Forced to switch to LXX theme.
|
||||||
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_NULL, THEME_ID_LXX);
|
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_NULL, THEME_ID_LXX_DARK);
|
||||||
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_ICS, THEME_ID_LXX);
|
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_ICS, THEME_ID_LXX_DARK);
|
||||||
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_KLP, THEME_ID_LXX);
|
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_KLP, THEME_ID_LXX_DARK);
|
||||||
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX);
|
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_DARK);
|
||||||
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX);
|
assertDefaultKeyboardTheme(sdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_DARK);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testDefaultKeyboardThemeOnLxx() {
|
public void testDefaultKeyboardThemeOnLxx() {
|
||||||
|
|
@ -230,11 +230,11 @@ public class KeyboardThemeTests extends AndroidTestCase {
|
||||||
|
|
||||||
private void assertUpgradeKeyboardToLxxOnLxx(final int sdkVersion) {
|
private void assertUpgradeKeyboardToLxxOnLxx(final int sdkVersion) {
|
||||||
// Forced to switch to LXX theme.
|
// Forced to switch to LXX theme.
|
||||||
assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_NULL, THEME_ID_LXX);
|
assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_NULL, THEME_ID_LXX_DARK);
|
||||||
assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_ICS, THEME_ID_LXX);
|
assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_ICS, THEME_ID_LXX_DARK);
|
||||||
assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_KLP, THEME_ID_LXX);
|
assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_KLP, THEME_ID_LXX_DARK);
|
||||||
assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX);
|
assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_DARK);
|
||||||
assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX);
|
assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_DARK);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Upgrading keyboard on L.
|
// Upgrading keyboard on L.
|
||||||
|
|
@ -293,11 +293,16 @@ public class KeyboardThemeTests extends AndroidTestCase {
|
||||||
private void assertUpgradePlatformToLxxFrom(final int oldSdkVersion) {
|
private void assertUpgradePlatformToLxxFrom(final int oldSdkVersion) {
|
||||||
// Forced to switch to LXX theme.
|
// Forced to switch to LXX theme.
|
||||||
final int newSdkVersion = VERSION_CODES_LXX;
|
final int newSdkVersion = VERSION_CODES_LXX;
|
||||||
assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_NULL, THEME_ID_LXX);
|
assertUpgradePlatformFromTo(
|
||||||
assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_ICS, THEME_ID_LXX);
|
oldSdkVersion, newSdkVersion, THEME_ID_NULL, THEME_ID_LXX_DARK);
|
||||||
assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_KLP, THEME_ID_LXX);
|
assertUpgradePlatformFromTo(
|
||||||
assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX);
|
oldSdkVersion, newSdkVersion, THEME_ID_ICS, THEME_ID_LXX_DARK);
|
||||||
assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX);
|
assertUpgradePlatformFromTo(
|
||||||
|
oldSdkVersion, newSdkVersion, THEME_ID_KLP, THEME_ID_LXX_DARK);
|
||||||
|
assertUpgradePlatformFromTo(
|
||||||
|
oldSdkVersion, newSdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_DARK);
|
||||||
|
assertUpgradePlatformFromTo(
|
||||||
|
oldSdkVersion, newSdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_DARK);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update platform from I,J, and K to L
|
// Update platform from I,J, and K to L
|
||||||
|
|
@ -314,10 +319,15 @@ public class KeyboardThemeTests extends AndroidTestCase {
|
||||||
public void testUpgradePlatformToLxxFromLxx() {
|
public void testUpgradePlatformToLxxFromLxx() {
|
||||||
final int oldSdkVersion = VERSION_CODES_LXX;
|
final int oldSdkVersion = VERSION_CODES_LXX;
|
||||||
final int newSdkVersion = VERSION_CODES_LXX;
|
final int newSdkVersion = VERSION_CODES_LXX;
|
||||||
assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_NULL, THEME_ID_LXX);
|
assertUpgradePlatformFromTo(
|
||||||
assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_ICS, THEME_ID_ICS);
|
oldSdkVersion, newSdkVersion, THEME_ID_NULL, THEME_ID_LXX_DARK);
|
||||||
assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_KLP, THEME_ID_KLP);
|
assertUpgradePlatformFromTo(
|
||||||
assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX);
|
oldSdkVersion, newSdkVersion, THEME_ID_ICS, THEME_ID_ICS);
|
||||||
assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX);
|
assertUpgradePlatformFromTo(
|
||||||
|
oldSdkVersion, newSdkVersion, THEME_ID_KLP, THEME_ID_KLP);
|
||||||
|
assertUpgradePlatformFromTo(
|
||||||
|
oldSdkVersion, newSdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_DARK);
|
||||||
|
assertUpgradePlatformFromTo(
|
||||||
|
oldSdkVersion, newSdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_DARK);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||