am 0179b8ed: Merge "Fix emoji key background of Holo themes"

* commit '0179b8ed7f5c647212036c39bc94d70e54129687':
  Fix emoji key background of Holo themes
main
Tadashi G. Takaoka 2014-11-14 18:17:32 +00:00 committed by Android Git Automerger
commit 5b9fcdfeea
11 changed files with 17 additions and 9 deletions

View File

@ -32,6 +32,8 @@
android:drawable="@drawable/btn_keyboard_key_normal_off_holo_dark" /> android:drawable="@drawable/btn_keyboard_key_normal_off_holo_dark" />
<!-- Empty background keys. --> <!-- Empty background keys. -->
<item android:state_empty="true" android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_pressed_ics_light" />
<item android:state_empty="true" <item android:state_empty="true"
android:drawable="@android:color/transparent" /> android:drawable="@android:color/transparent" />

View File

@ -32,6 +32,8 @@
android:drawable="@drawable/btn_keyboard_key_normal_off_holo_dark" /> android:drawable="@drawable/btn_keyboard_key_normal_off_holo_dark" />
<!-- Empty background keys. --> <!-- Empty background keys. -->
<item android:state_empty="true" android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_pressed_klp_light" />
<item android:state_empty="true" <item android:state_empty="true"
android:drawable="@android:color/transparent" /> android:drawable="@android:color/transparent" />

View File

@ -32,8 +32,10 @@
android:drawable="@drawable/btn_keyboard_key_normal_off_lxx_dark" /> android:drawable="@drawable/btn_keyboard_key_normal_off_lxx_dark" />
<!-- Empty background keys. --> <!-- Empty background keys. -->
<item android:state_empty="true" android:state_pressed="true"
android:drawable="@color/key_background_pressed_lxx_dark" />
<item android:state_empty="true" <item android:state_empty="true"
android:drawable="@color/key_background_lxx_dark" /> android:drawable="@android:color/transparent" />
<!-- Normal keys. --> <!-- Normal keys. -->
<item android:state_pressed="true" <item android:state_pressed="true"

View File

@ -32,8 +32,10 @@
android:drawable="@drawable/btn_keyboard_key_normal_off_lxx_light" /> android:drawable="@drawable/btn_keyboard_key_normal_off_lxx_light" />
<!-- Empty background keys. --> <!-- Empty background keys. -->
<item android:state_empty="true" android:state_pressed="true"
android:drawable="@color/key_background_pressed_lxx_light" />
<item android:state_empty="true" <item android:state_empty="true"
android:drawable="@color/key_background_lxx_light" /> android:drawable="@android:color/transparent" />
<!-- Normal keys. --> <!-- Normal keys. -->
<item android:state_pressed="true" <item android:state_pressed="true"

View File

@ -27,5 +27,5 @@
<GridRows <GridRows
latin:codesArray="@array/emoji_faces" latin:codesArray="@array/emoji_faces"
latin:keyLabelFlags="fontNormal" latin:keyLabelFlags="fontNormal"
latin:backgroundType="normal" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

View File

@ -27,5 +27,5 @@
<GridRows <GridRows
latin:codesArray="@array/emoji_objects" latin:codesArray="@array/emoji_objects"
latin:keyLabelFlags="fontNormal" latin:keyLabelFlags="fontNormal"
latin:backgroundType="normal" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

View File

@ -27,5 +27,5 @@
<GridRows <GridRows
latin:codesArray="@array/emoji_nature" latin:codesArray="@array/emoji_nature"
latin:keyLabelFlags="fontNormal" latin:keyLabelFlags="fontNormal"
latin:backgroundType="normal" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

View File

@ -27,5 +27,5 @@
<GridRows <GridRows
latin:codesArray="@array/emoji_places" latin:codesArray="@array/emoji_places"
latin:keyLabelFlags="fontNormal" latin:keyLabelFlags="fontNormal"
latin:backgroundType="normal" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

View File

@ -27,5 +27,5 @@
<GridRows <GridRows
latin:codesArray="@array/emoji_symbols" latin:codesArray="@array/emoji_symbols"
latin:keyLabelFlags="fontNormal" latin:keyLabelFlags="fontNormal"
latin:backgroundType="normal" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

View File

@ -28,5 +28,5 @@
<GridRows <GridRows
latin:textsArray="@array/emoji_emoticons" latin:textsArray="@array/emoji_emoticons"
latin:keyLabelFlags="fontNormal" latin:keyLabelFlags="fontNormal"
latin:backgroundType="normal" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>

View File

@ -28,5 +28,5 @@
<GridRows <GridRows
latin:codesArray="@array/emoji_recents" latin:codesArray="@array/emoji_recents"
latin:keyLabelFlags="fontNormal" latin:keyLabelFlags="fontNormal"
latin:backgroundType="normal" /> latin:backgroundType="empty" />
</Keyboard> </Keyboard>