am 161fa05d: Update LMP colors and temporal drawables

* commit '161fa05d0306eb8d115f9cac63e53047be4145e5':
  Update LMP colors and temporal drawables
main
Tadashi G. Takaoka 2014-05-14 03:18:02 +00:00 committed by Android Git Automerger
commit dfb58db4d3
30 changed files with 34 additions and 28 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 639 B

After

Width:  |  Height:  |  Size: 130 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 537 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 655 B

After

Width:  |  Height:  |  Size: 138 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 670 B

After

Width:  |  Height:  |  Size: 130 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 517 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 120 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 453 B

After

Width:  |  Height:  |  Size: 114 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 380 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 124 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 458 B

After

Width:  |  Height:  |  Size: 114 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 368 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 153 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 787 B

After

Width:  |  Height:  |  Size: 149 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 657 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 848 B

After

Width:  |  Height:  |  Size: 159 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 867 B

After

Width:  |  Height:  |  Size: 149 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 634 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 182 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 186 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 182 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 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="@drawable/btn_keyboard_key_dark_pressed_lmp" />
<item android:drawable="@android:color/transparent" />
android:drawable="@color/key_background_pressed_lmp" />
<item android:drawable="@color/key_background_lmp" />
</selector>

View File

@ -17,32 +17,32 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Functional keys. -->
<item android:state_single="true" android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_dark_pressed_lmp" />
android:drawable="@color/key_background_pressed_lmp" />
<item android:state_single="true"
android:drawable="@android:color/transparent" />
android:drawable="@color/key_background_lmp" />
<!-- Action keys. -->
<item android:state_active="true" android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_dark_pressed_lmp" />
android:drawable="@color/key_background_pressed_lmp" />
<item android:state_active="true"
android:drawable="@android:color/transparent" />
android:drawable="@color/key_background_lmp" />
<!-- 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" />
<item android:state_checkable="true" android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_dark_pressed_lmp" />
android:drawable="@drawable/btn_keyboard_key_dark_pressed_off_lmp" />
<item android:state_checkable="true" android:state_checked="true"
android:drawable="@drawable/btn_keyboard_key_dark_normal_on_lmp" />
<item android:state_checkable="true"
android:drawable="@android:color/transparent" />
android:drawable="@drawable/btn_keyboard_key_dark_normal_off_lmp" />
<!-- Empty background keys. -->
<item android:state_empty="true"
android:drawable="@android:color/transparent" />
android:drawable="@color/key_background_lmp" />
<!-- Normal keys. -->
<item android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_light_pressed_lmp" />
<item android:drawable="@android:color/transparent" />
android:drawable="@color/key_background_pressed_lmp" />
<item android:drawable="@color/key_background_lmp" />
</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_light_pressed_lmp" />
<item android:drawable="@android:color/transparent" />
android:drawable="@color/key_background_pressed_lmp" />
<item android:drawable="@color/key_background_lmp" />
</selector>

View File

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

View File

@ -40,11 +40,17 @@
<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_hint_letter_color_lmp">@android:color/white</color>
<color name="highlight_color_lmp">#FFF0F0F0</color>
<color name="typed_word_color_lmp">#D8F0F0F0</color>
<color name="suggested_word_color_lmp">#B2F0F0F0</color>
<color name="highlight_translucent_color_lmp">#99E0E0E0</color>
<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 setup wizard and tutorial -->
<color name="setup_background">#FFEBEBEB</color>
<color name="setup_text_dark">#FF707070</color>

View File

@ -35,7 +35,7 @@
parent="Keyboard"
>
<!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
<item name="themeId">0</item>
<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>
@ -46,15 +46,15 @@
name="KeyboardView.LMP"
parent="KeyboardView"
>
<item name="android:background">@drawable/keyboard_background_holo</item>
<item name="android:background">@color/keyboard_background_lmp</item>
<item name="keyBackground">@drawable/btn_keyboard_key_lmp</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="keyTextInactivatedColor">@color/key_text_inactive_color_lmp</item>
<item name="keyHintLetterColor">@color/key_hint_letter_color_lmp</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="keyHintLabelColor">@color/key_text_inactive_color_lmp</item>
<item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lmp</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>
@ -70,9 +70,9 @@
<item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_lmp</item>
<item name="autoCorrectionSpacebarLedEnabled">false</item>
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>
<item name="languageOnSpacebarTextColor">@color/spacebar_text_color_holo</item>
<item name="languageOnSpacebarTextShadowRadius">1.0</item>
<item name="languageOnSpacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
<item name="languageOnSpacebarTextColor">@color/key_text_inactive_color_lmp</item>
<!-- A negative value to disable text shadow layer. -->
<item name="languageOnSpacebarTextShadowRadius">-1.0</item>
<item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lmp</item>
</style>
<style