diff options
Diffstat (limited to 'java/res')
206 files changed, 3083 insertions, 3087 deletions
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png Binary files differdeleted file mode 100644 index 116329016..000000000 --- a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png Binary files differdeleted file mode 100644 index 207c90d6c..000000000 --- a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png Binary files differdeleted file mode 100644 index cdd6c8b79..000000000 --- a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png Binary files differdeleted file mode 100644 index d8421746a..000000000 --- a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png Binary files differdeleted file mode 100644 index 671d4e5d6..000000000 --- a/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/ic_settings_language.png b/java/res/drawable-hdpi/ic_settings_language.png Binary files differdeleted file mode 100644 index f635b2e7a..000000000 --- a/java/res/drawable-hdpi/ic_settings_language.png +++ /dev/null diff --git a/java/res/drawable-hdpi/keyboard_background.9.png b/java/res/drawable-hdpi/keyboard_background.9.png Binary files differdeleted file mode 100644 index d57463fb6..000000000 --- a/java/res/drawable-hdpi/keyboard_background.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/keyboard_dark_background.9.png b/java/res/drawable-hdpi/keyboard_background_gb.9.png Binary files differindex fa3d449f7..fa3d449f7 100644 --- a/java/res/drawable-hdpi/keyboard_dark_background.9.png +++ b/java/res/drawable-hdpi/keyboard_background_gb.9.png diff --git a/java/res/drawable-hdpi/keyboard_background_holo.9.png b/java/res/drawable-hdpi/keyboard_background_ics.9.png Binary files differindex 73868751c..73868751c 100644 --- a/java/res/drawable-hdpi/keyboard_background_holo.9.png +++ b/java/res/drawable-hdpi/keyboard_background_ics.9.png diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background_gb.9.png Binary files differindex baff80950..baff80950 100644 --- a/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png +++ b/java/res/drawable-hdpi/keyboard_popup_panel_background_gb.9.png diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip.9.png b/java/res/drawable-hdpi/keyboard_suggest_strip_gb.9.png Binary files differindex 7cab5a899..7cab5a899 100644 --- a/java/res/drawable-hdpi/keyboard_suggest_strip.9.png +++ b/java/res/drawable-hdpi/keyboard_suggest_strip_gb.9.png diff --git a/java/res/drawable-hdpi/sym_bkeyboard_delete.png b/java/res/drawable-hdpi/sym_bkeyboard_delete.png Binary files differdeleted file mode 100644 index 1d24cc85c..000000000 --- a/java/res/drawable-hdpi/sym_bkeyboard_delete.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_bkeyboard_label_mic.png b/java/res/drawable-hdpi/sym_bkeyboard_label_mic.png Binary files differdeleted file mode 100644 index 25702cf73..000000000 --- a/java/res/drawable-hdpi/sym_bkeyboard_label_mic.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_bkeyboard_mic.png b/java/res/drawable-hdpi/sym_bkeyboard_mic.png Binary files differdeleted file mode 100644 index 512f46080..000000000 --- a/java/res/drawable-hdpi/sym_bkeyboard_mic.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_bkeyboard_return.png b/java/res/drawable-hdpi/sym_bkeyboard_return.png Binary files differdeleted file mode 100644 index 426e1599e..000000000 --- a/java/res/drawable-hdpi/sym_bkeyboard_return.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_bkeyboard_search.png b/java/res/drawable-hdpi/sym_bkeyboard_search.png Binary files differdeleted file mode 100644 index 1b6f884fa..000000000 --- a/java/res/drawable-hdpi/sym_bkeyboard_search.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_bkeyboard_settings.png b/java/res/drawable-hdpi/sym_bkeyboard_settings.png Binary files differdeleted file mode 100644 index 08ba18f28..000000000 --- a/java/res/drawable-hdpi/sym_bkeyboard_settings.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_bkeyboard_shift.png b/java/res/drawable-hdpi/sym_bkeyboard_shift.png Binary files differdeleted file mode 100644 index 5a22dd309..000000000 --- a/java/res/drawable-hdpi/sym_bkeyboard_shift.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png b/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png Binary files differdeleted file mode 100644 index 566449126..000000000 --- a/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_bkeyboard_space.png b/java/res/drawable-hdpi/sym_bkeyboard_space.png Binary files differdeleted file mode 100644 index cd0ebe2f4..000000000 --- a/java/res/drawable-hdpi/sym_bkeyboard_space.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_bkeyboard_tab.png b/java/res/drawable-hdpi/sym_bkeyboard_tab.png Binary files differdeleted file mode 100644 index 3466e1271..000000000 --- a/java/res/drawable-hdpi/sym_bkeyboard_tab.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_bkeyboard_voice_off.png b/java/res/drawable-hdpi/sym_bkeyboard_voice_off.png Binary files differdeleted file mode 100644 index 081a13096..000000000 --- a/java/res/drawable-hdpi/sym_bkeyboard_voice_off.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_keyboard_space_led.9.png b/java/res/drawable-hdpi/sym_keyboard_space_led_gb.9.png Binary files differindex c76f64b94..c76f64b94 100644 --- a/java/res/drawable-hdpi/sym_keyboard_space_led.9.png +++ b/java/res/drawable-hdpi/sym_keyboard_space_led_gb.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png b/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png Binary files differdeleted file mode 100644 index 4b1a78cfb..000000000 --- a/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png b/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png Binary files differdeleted file mode 100644 index 697683e29..000000000 --- a/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png Binary files differdeleted file mode 100644 index cdd6c8b79..000000000 --- a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png Binary files differdeleted file mode 100644 index d8421746a..000000000 --- a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png Binary files differdeleted file mode 100644 index 73cf35df0..000000000 --- a/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/ic_settings_language.png b/java/res/drawable-mdpi/ic_settings_language.png Binary files differdeleted file mode 100644 index f8aca679b..000000000 --- a/java/res/drawable-mdpi/ic_settings_language.png +++ /dev/null diff --git a/java/res/drawable-mdpi/keyboard_background.9.png b/java/res/drawable-mdpi/keyboard_background.9.png Binary files differdeleted file mode 100644 index 2bd4b628d..000000000 --- a/java/res/drawable-mdpi/keyboard_background.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/keyboard_dark_background.9.png b/java/res/drawable-mdpi/keyboard_background_gb.9.png Binary files differindex 4f81704c4..4f81704c4 100644 --- a/java/res/drawable-mdpi/keyboard_dark_background.9.png +++ b/java/res/drawable-mdpi/keyboard_background_gb.9.png diff --git a/java/res/drawable-mdpi/keyboard_background_holo.9.png b/java/res/drawable-mdpi/keyboard_background_ics.9.png Binary files differindex fbe97f7a2..fbe97f7a2 100644 --- a/java/res/drawable-mdpi/keyboard_background_holo.9.png +++ b/java/res/drawable-mdpi/keyboard_background_ics.9.png diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_gb.9.png Binary files differindex 0d9ab97f0..0d9ab97f0 100644 --- a/java/res/drawable-mdpi/keyboard_popup_panel_background.9.png +++ b/java/res/drawable-mdpi/keyboard_popup_panel_background_gb.9.png diff --git a/java/res/drawable-mdpi/keyboard_suggest_strip.9.png b/java/res/drawable-mdpi/keyboard_suggest_strip_gb.9.png Binary files differindex fa6c0feff..fa6c0feff 100644 --- a/java/res/drawable-mdpi/keyboard_suggest_strip.9.png +++ b/java/res/drawable-mdpi/keyboard_suggest_strip_gb.9.png diff --git a/java/res/drawable-mdpi/sym_bkeyboard_delete.png b/java/res/drawable-mdpi/sym_bkeyboard_delete.png Binary files differdeleted file mode 100644 index 1a5ff439e..000000000 --- a/java/res/drawable-mdpi/sym_bkeyboard_delete.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_bkeyboard_label_mic.png b/java/res/drawable-mdpi/sym_bkeyboard_label_mic.png Binary files differdeleted file mode 100644 index 7f0b1355f..000000000 --- a/java/res/drawable-mdpi/sym_bkeyboard_label_mic.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_bkeyboard_mic.png b/java/res/drawable-mdpi/sym_bkeyboard_mic.png Binary files differdeleted file mode 100644 index a6cb1cc01..000000000 --- a/java/res/drawable-mdpi/sym_bkeyboard_mic.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_bkeyboard_return.png b/java/res/drawable-mdpi/sym_bkeyboard_return.png Binary files differdeleted file mode 100644 index e76225d0f..000000000 --- a/java/res/drawable-mdpi/sym_bkeyboard_return.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_bkeyboard_search.png b/java/res/drawable-mdpi/sym_bkeyboard_search.png Binary files differdeleted file mode 100644 index 1f180155d..000000000 --- a/java/res/drawable-mdpi/sym_bkeyboard_search.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_bkeyboard_settings.png b/java/res/drawable-mdpi/sym_bkeyboard_settings.png Binary files differdeleted file mode 100644 index 08ba18f28..000000000 --- a/java/res/drawable-mdpi/sym_bkeyboard_settings.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_bkeyboard_shift.png b/java/res/drawable-mdpi/sym_bkeyboard_shift.png Binary files differdeleted file mode 100644 index c981188dd..000000000 --- a/java/res/drawable-mdpi/sym_bkeyboard_shift.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_bkeyboard_shift_locked.png b/java/res/drawable-mdpi/sym_bkeyboard_shift_locked.png Binary files differdeleted file mode 100644 index b8cebd060..000000000 --- a/java/res/drawable-mdpi/sym_bkeyboard_shift_locked.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_bkeyboard_space.png b/java/res/drawable-mdpi/sym_bkeyboard_space.png Binary files differdeleted file mode 100644 index 4da7ee86e..000000000 --- a/java/res/drawable-mdpi/sym_bkeyboard_space.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_bkeyboard_tab.png b/java/res/drawable-mdpi/sym_bkeyboard_tab.png Binary files differdeleted file mode 100644 index 2cb991cbf..000000000 --- a/java/res/drawable-mdpi/sym_bkeyboard_tab.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_bkeyboard_voice_off.png b/java/res/drawable-mdpi/sym_bkeyboard_voice_off.png Binary files differdeleted file mode 100644 index 081a13096..000000000 --- a/java/res/drawable-mdpi/sym_bkeyboard_voice_off.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_keyboard_space_led.9.png b/java/res/drawable-mdpi/sym_keyboard_space_led_gb.9.png Binary files differindex 1c1ca2cc7..1c1ca2cc7 100644 --- a/java/res/drawable-mdpi/sym_keyboard_space_led.9.png +++ b/java/res/drawable-mdpi/sym_keyboard_space_led_gb.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_normal.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_normal.9.png Binary files differdeleted file mode 100644 index f7e32f764..000000000 --- a/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_normal.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed.9.png Binary files differdeleted file mode 100644 index df3b5ba2d..000000000 --- a/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_stone.9.png Binary files differdeleted file mode 100644 index dec219304..000000000 --- a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_stone.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_stone.9.png Binary files differdeleted file mode 100644 index 3c77b3ccd..000000000 --- a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_stone.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_stone.9.png Binary files differdeleted file mode 100644 index 5cdfc4201..000000000 --- a/java/res/drawable-xhdpi/btn_keyboard_key_normal_stone.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/ic_settings_language.png b/java/res/drawable-xhdpi/ic_settings_language.png Binary files differdeleted file mode 100644 index 2c42db3aa..000000000 --- a/java/res/drawable-xhdpi/ic_settings_language.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/keyboard_background.9.png b/java/res/drawable-xhdpi/keyboard_background.9.png Binary files differdeleted file mode 100644 index 263996322..000000000 --- a/java/res/drawable-xhdpi/keyboard_background.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/keyboard_dark_background.9.png b/java/res/drawable-xhdpi/keyboard_background_gb.9.png Binary files differindex 27b7a108c..27b7a108c 100644 --- a/java/res/drawable-xhdpi/keyboard_dark_background.9.png +++ b/java/res/drawable-xhdpi/keyboard_background_gb.9.png diff --git a/java/res/drawable-xhdpi/keyboard_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_background_ics.9.png Binary files differindex f5c9df3e5..f5c9df3e5 100644 --- a/java/res/drawable-xhdpi/keyboard_background_holo.9.png +++ b/java/res/drawable-xhdpi/keyboard_background_ics.9.png diff --git a/java/res/drawable-xhdpi/keyboard_popup_panel_background.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background_gb.9.png Binary files differindex 79f7ab00a..79f7ab00a 100644 --- a/java/res/drawable-xhdpi/keyboard_popup_panel_background.9.png +++ b/java/res/drawable-xhdpi/keyboard_popup_panel_background_gb.9.png diff --git a/java/res/drawable-xhdpi/keyboard_suggest_strip.9.png b/java/res/drawable-xhdpi/keyboard_suggest_strip_gb.9.png Binary files differindex 1b568df03..1b568df03 100644 --- a/java/res/drawable-xhdpi/keyboard_suggest_strip.9.png +++ b/java/res/drawable-xhdpi/keyboard_suggest_strip_gb.9.png diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_delete.png b/java/res/drawable-xhdpi/sym_bkeyboard_delete.png Binary files differdeleted file mode 100644 index b84ee76dc..000000000 --- a/java/res/drawable-xhdpi/sym_bkeyboard_delete.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_label_mic.png b/java/res/drawable-xhdpi/sym_bkeyboard_label_mic.png Binary files differdeleted file mode 100644 index 9bd1d65b4..000000000 --- a/java/res/drawable-xhdpi/sym_bkeyboard_label_mic.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_mic.png b/java/res/drawable-xhdpi/sym_bkeyboard_mic.png Binary files differdeleted file mode 100644 index 8c3f11dd4..000000000 --- a/java/res/drawable-xhdpi/sym_bkeyboard_mic.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_return.png b/java/res/drawable-xhdpi/sym_bkeyboard_return.png Binary files differdeleted file mode 100644 index 1632ecd8e..000000000 --- a/java/res/drawable-xhdpi/sym_bkeyboard_return.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_search.png b/java/res/drawable-xhdpi/sym_bkeyboard_search.png Binary files differdeleted file mode 100644 index 69d8b22d1..000000000 --- a/java/res/drawable-xhdpi/sym_bkeyboard_search.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_settings.png b/java/res/drawable-xhdpi/sym_bkeyboard_settings.png Binary files differdeleted file mode 100644 index 050154a3a..000000000 --- a/java/res/drawable-xhdpi/sym_bkeyboard_settings.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_shift.png b/java/res/drawable-xhdpi/sym_bkeyboard_shift.png Binary files differdeleted file mode 100644 index d15d11a50..000000000 --- a/java/res/drawable-xhdpi/sym_bkeyboard_shift.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_shift_locked.png b/java/res/drawable-xhdpi/sym_bkeyboard_shift_locked.png Binary files differdeleted file mode 100644 index 83b287fea..000000000 --- a/java/res/drawable-xhdpi/sym_bkeyboard_shift_locked.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_space.png b/java/res/drawable-xhdpi/sym_bkeyboard_space.png Binary files differdeleted file mode 100644 index 5ca62c7b7..000000000 --- a/java/res/drawable-xhdpi/sym_bkeyboard_space.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_tab.png b/java/res/drawable-xhdpi/sym_bkeyboard_tab.png Binary files differdeleted file mode 100644 index 6ca199755..000000000 --- a/java/res/drawable-xhdpi/sym_bkeyboard_tab.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_voice_off.png b/java/res/drawable-xhdpi/sym_bkeyboard_voice_off.png Binary files differdeleted file mode 100644 index fc6a4eb59..000000000 --- a/java/res/drawable-xhdpi/sym_bkeyboard_voice_off.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/sym_keyboard_space_led.9.png b/java/res/drawable-xhdpi/sym_keyboard_space_led_gb.9.png Binary files differindex 6525fefab..6525fefab 100644 --- a/java/res/drawable-xhdpi/sym_keyboard_space_led.9.png +++ b/java/res/drawable-xhdpi/sym_keyboard_space_led_gb.9.png diff --git a/java/res/drawable-xxhdpi/keyboard_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_background_ics.9.png Binary files differindex bcef0f839..bcef0f839 100644 --- a/java/res/drawable-xxhdpi/keyboard_background_holo.9.png +++ b/java/res/drawable-xxhdpi/keyboard_background_ics.9.png diff --git a/java/res/drawable/btn_keyboard_key.xml b/java/res/drawable/btn_keyboard_key.xml deleted file mode 100644 index 112ac2636..000000000 --- a/java/res/drawable/btn_keyboard_key.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- 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_pressed_on" /> - <item android:state_checkable="true" android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_pressed_off" /> - <item android:state_checkable="true" android:state_checked="true" - android:drawable="@drawable/btn_keyboard_key_normal_on" /> - <item android:state_checkable="true" - android:drawable="@drawable/btn_keyboard_key_normal_off" /> - - <!-- Empty background keys. --> - <item android:state_empty="true" - android:drawable="@drawable/transparent" /> - - <!-- Normal keys. --> - <item android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_pressed" /> - <item android:drawable="@drawable/btn_keyboard_key_normal" /> -</selector> diff --git a/java/res/drawable/btn_keyboard_key3.xml b/java/res/drawable/btn_keyboard_key3.xml deleted file mode 100644 index 080b1f326..000000000 --- a/java/res/drawable/btn_keyboard_key3.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- 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_pressed_on" /> - <item android:state_checkable="true" android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_fulltrans_normal" /> - <item android:state_checkable="true" android:state_checked="true" - android:drawable="@drawable/btn_keyboard_key_normal_on" /> - <item android:state_checkable="true" - android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" /> - - <!-- Empty background keys. --> - <item android:state_empty="true" - android:drawable="@drawable/transparent" /> - - <!-- Normal keys. --> - <item android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_fulltrans_normal" /> - <item android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" /> -</selector> diff --git a/java/res/drawable/btn_keyboard_key_gingerbread.xml b/java/res/drawable/btn_keyboard_key_gb.xml index 3fc253e85..3fc253e85 100644 --- a/java/res/drawable/btn_keyboard_key_gingerbread.xml +++ b/java/res/drawable/btn_keyboard_key_gb.xml diff --git a/java/res/drawable/btn_keyboard_key_popup.xml b/java/res/drawable/btn_keyboard_key_popup_gb.xml index 9e3670d22..9e3670d22 100644 --- a/java/res/drawable/btn_keyboard_key_popup.xml +++ b/java/res/drawable/btn_keyboard_key_popup_gb.xml diff --git a/java/res/drawable/btn_keyboard_key_stone.xml b/java/res/drawable/btn_keyboard_key_stone.xml deleted file mode 100644 index 70a2ad444..000000000 --- a/java/res/drawable/btn_keyboard_key_stone.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<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_fulltrans_pressed" /> - <item android:state_single="true" - android:drawable="@drawable/btn_keyboard_key_normal_stone" /> - - <!-- Action keys. --> - <item android:state_active="true" android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" /> - <item android:state_active="true" - android:drawable="@drawable/btn_keyboard_key_normal_stone" /> - - <!-- 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_normal_on_stone" /> - <item android:state_checkable="true" android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_normal_off_stone" /> - <item android:state_checkable="true" android:state_checked="true" - android:drawable="@drawable/btn_keyboard_key_normal_on_stone" /> - <item android:state_checkable="true" - android:drawable="@drawable/btn_keyboard_key_normal_off_stone" /> - - <!-- Empty background keys. --> - <item android:state_empty="true" - android:drawable="@drawable/transparent" /> - - <!-- Normal keys. --> - <item android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" /> - <item android:drawable="@drawable/btn_keyboard_key_normal_stone" /> -</selector> diff --git a/java/res/drawable/btn_suggestion.xml b/java/res/drawable/btn_suggestion_gb.xml index cde12fe55..cde12fe55 100644 --- a/java/res/drawable/btn_suggestion.xml +++ b/java/res/drawable/btn_suggestion_gb.xml diff --git a/java/res/drawable/keyboard_key_feedback.xml b/java/res/drawable/keyboard_key_feedback_gb.xml index 397e948d8..397e948d8 100644 --- a/java/res/drawable/keyboard_key_feedback.xml +++ b/java/res/drawable/keyboard_key_feedback_gb.xml diff --git a/java/res/layout/hint_add_to_dictionary.xml b/java/res/layout/hint_add_to_dictionary.xml index 73de44fae..63d4001ad 100644 --- a/java/res/layout/hint_add_to_dictionary.xml +++ b/java/res/layout/hint_add_to_dictionary.xml @@ -33,4 +33,4 @@ android:clickable="false" android:singleLine="true" android:ellipsize="none" - style="?attr/suggestionBackgroundStyle" /> + android:background="?attr/suggestionBackground" /> diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml index 78217b01a..51133b289 100644 --- a/java/res/layout/input_view.xml +++ b/java/res/layout/input_view.xml @@ -34,6 +34,7 @@ android:layout_height="@dimen/suggestions_strip_height" android:paddingRight="@dimen/suggestions_strip_padding" android:paddingLeft="@dimen/suggestions_strip_padding" + android:background="?attr/suggestionStripBackground" style="?attr/suggestionStripViewStyle" /> <!-- To ensure that key preview popup is correctly placed when the current system locale is one of RTL locales, layoutDirection="ltr" is needed in the SDK version 17+. --> diff --git a/java/res/layout/key_preview.xml b/java/res/layout/key_preview_gb.xml index 2fcd0c4dd..2f2a321a3 100644 --- a/java/res/layout/key_preview.xml +++ b/java/res/layout/key_preview_gb.xml @@ -21,7 +21,7 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/keyboard_key_feedback" + android:background="@drawable/keyboard_key_feedback_gb" android:minWidth="32dp" android:gravity="center" /> diff --git a/java/res/layout/more_keys_keyboard.xml b/java/res/layout/more_keys_keyboard.xml index 6b2464b99..cab3abcd9 100644 --- a/java/res/layout/more_keys_keyboard.xml +++ b/java/res/layout/more_keys_keyboard.xml @@ -17,17 +17,17 @@ ** limitations under the License. */ --> + <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - style="?attr/moreKeysKeyboardPanelStyle" - > + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:background="?attr/moreKeysKeyboardBackground" +> <com.android.inputmethod.keyboard.MoreKeysKeyboardView - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - android:id="@+id/more_keys_keyboard_view" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - /> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + android:id="@+id/more_keys_keyboard_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> </LinearLayout> diff --git a/java/res/layout/more_suggestions.xml b/java/res/layout/more_suggestions.xml index b41bb8aa4..0ec0ed1b3 100644 --- a/java/res/layout/more_suggestions.xml +++ b/java/res/layout/more_suggestions.xml @@ -17,21 +17,21 @@ ** limitations under the License. */ --> + <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:background="?attr/moreKeysKeyboardBackground" +> + <com.android.inputmethod.latin.suggestions.MoreSuggestionsView + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + android:id="@+id/more_suggestions_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" - style="?attr/moreKeysKeyboardPanelStyle" - > - <com.android.inputmethod.latin.suggestions.MoreSuggestionsView - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - android:id="@+id/more_suggestions_view" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - latin:keyLetterSize="@dimen/suggestion_text_size" - latin:keyLabelSize="@dimen/suggestion_text_size" - latin:keyHintLetterRatio="@fraction/more_suggestions_info_ratio" - latin:keyHintLetterColor="@android:color/white" - /> + latin:keyLetterSize="@dimen/suggestion_text_size" + latin:keyLabelSize="@dimen/suggestion_text_size" + latin:keyHintLetterRatio="@fraction/more_suggestions_info_ratio" + latin:keyHintLetterColor="@android:color/white" /> </LinearLayout> diff --git a/java/res/layout/suggestion_info.xml b/java/res/layout/suggestion_info.xml index a4ad6df25..8b0ee3484 100644 --- a/java/res/layout/suggestion_info.xml +++ b/java/res/layout/suggestion_info.xml @@ -24,4 +24,4 @@ android:layout_height="wrap_content" android:textSize="6dp" android:textColor="@android:color/white" - style="?attr/suggestionBackgroundStyle" /> + android:background="?attr/suggestionBackground" /> diff --git a/java/res/layout/suggestion_word.xml b/java/res/layout/suggestion_word.xml index fa00e041e..e32e6952b 100644 --- a/java/res/layout/suggestion_word.xml +++ b/java/res/layout/suggestion_word.xml @@ -36,4 +36,4 @@ android:clickable="false" android:singleLine="true" android:ellipsize="none" - style="?attr/suggestionBackgroundStyle" /> + android:background="?attr/suggestionBackground" /> diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml index c78c25f86..c954e60da 100644 --- a/java/res/values-land/dimens.xml +++ b/java/res/values-land/dimens.xml @@ -26,14 +26,8 @@ <!-- key_height + key_bottom_gap = popup_key_height --> <dimen name="popup_key_height">44.8dp</dimen> - <fraction name="keyboard_top_padding">1.818%p</fraction> - <fraction name="keyboard_bottom_padding">0.0%p</fraction> - <fraction name="key_bottom_gap">4.330%p</fraction> - <fraction name="key_horizontal_gap">0.405%p</fraction> - - <fraction name="key_bottom_gap_stone">5.010%p</fraction> - <fraction name="key_horizontal_gap_stone">1.159%p</fraction> - + <fraction name="keyboard_top_padding_gb">1.818%p</fraction> + <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction> <fraction name="key_bottom_gap_gb">5.941%p</fraction> <fraction name="key_horizontal_gap_gb">0.997%p</fraction> @@ -53,7 +47,7 @@ <fraction name="key_uppercase_letter_ratio">40%</fraction> <fraction name="key_preview_text_ratio">90%</fraction> <fraction name="spacebar_text_ratio">40.000%</fraction> - <dimen name="key_preview_offset">0.0dp</dimen> + <dimen name="key_preview_offset_gb">0.0dp</dimen> <!-- For 5-row keyboard --> <fraction name="key_bottom_gap_5row">3.20%p</fraction> @@ -72,11 +66,14 @@ <!-- popup_key_height x 1.2 --> <dimen name="more_keys_keyboard_slide_allowance">53.76dp</dimen> <!-- popup_key_height x -1.0 --> - <dimen name="more_keys_keyboard_vertical_correction">-44.8dp</dimen> + <dimen name="more_keys_keyboard_vertical_correction_gb">-44.8dp</dimen> <!-- Gesture floating preview text parameters --> <dimen name="gesture_floating_preview_text_size">23dp</dimen> <dimen name="gesture_floating_preview_text_offset">54dp</dimen> <dimen name="gesture_floating_preview_horizontal_padding">23dp</dimen> <dimen name="gesture_floating_preview_vertical_padding">15dp</dimen> + + <!-- Emoji keyboard --> + <fraction name="emoji_keyboard_key_width">8.3333%p</fraction> </resources> diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml index 51c710fa4..cda462f29 100644 --- a/java/res/values-sw600dp-land/dimens.xml +++ b/java/res/values-sw600dp-land/dimens.xml @@ -24,20 +24,15 @@ <dimen name="keyboardHeight">283.5dp</dimen> <fraction name="minKeyboardHeight">45%p</fraction> - <fraction name="keyboard_top_padding">2.444%p</fraction> - <fraction name="keyboard_bottom_padding">0.0%p</fraction> - <fraction name="key_bottom_gap">4.911%p</fraction> - <fraction name="key_horizontal_gap">1.284%p</fraction> - - <fraction name="key_bottom_gap_stone">4.355%p</fraction> - <fraction name="key_horizontal_gap_stone">1.505%p</fraction> - + <fraction name="keyboard_top_padding_gb">2.444%p</fraction> + <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction> <fraction name="key_bottom_gap_gb">5.200%p</fraction> <fraction name="key_horizontal_gap_gb">1.447%p</fraction> + <fraction name="keyboard_top_padding_ics">2.727%p</fraction> + <fraction name="keyboard_bottom_padding_ics">0.0%p</fraction> <fraction name="key_bottom_gap_ics">4.5%p</fraction> <fraction name="key_horizontal_gap_ics">0.9%p</fraction> - <fraction name="keyboard_bottom_padding_ics">0.0%p</fraction> <dimen name="popup_key_height">81.9dp</dimen> diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml index 826565168..93862a767 100644 --- a/java/res/values-sw600dp/config.xml +++ b/java/res/values-sw600dp/config.xml @@ -28,8 +28,6 @@ <bool name="config_auto_correction_spacebar_led_enabled">false</bool> <!-- The language is never displayed if == 0, always displayed if < 0 --> <integer name="config_delay_before_fadeout_language_on_spacebar">1200</integer> - <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. --> - <string name="config_default_keyboard_theme_index" translatable="false">5</string> <integer name="config_max_more_keys_column">5</integer> <!-- Configuration for MainKeyboardView diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index 75b476c64..7dfd0b162 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -27,27 +27,22 @@ <dimen name="popup_key_height">63.0dp</dimen> - <fraction name="keyboard_top_padding">2.291%p</fraction> - <fraction name="keyboard_bottom_padding">0.0%p</fraction> - <fraction name="key_bottom_gap">3.750%p</fraction> - <fraction name="key_horizontal_gap">1.857%p</fraction> - - <fraction name="key_bottom_gap_stone">3.75%p</fraction> - <fraction name="key_horizontal_gap_stone">1.602%p</fraction> - + <fraction name="keyboard_top_padding_gb">2.291%p</fraction> + <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction> <fraction name="key_bottom_gap_gb">4.625%p</fraction> <fraction name="key_horizontal_gap_gb">2.113%p</fraction> + <fraction name="keyboard_top_padding_ics">2.335%p</fraction> + <fraction name="keyboard_bottom_padding_ics">4.0%p</fraction> <fraction name="key_bottom_gap_ics">4.5%p</fraction> <fraction name="key_horizontal_gap_ics">1.565%p</fraction> - <fraction name="keyboard_bottom_padding_ics">4.0%p</fraction> <dimen name="more_keys_keyboard_key_horizontal_padding">6dp</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> <dimen name="more_keys_keyboard_slide_allowance">98.3dp</dimen> <!-- popup_key_height x -1.0 --> - <dimen name="more_keys_keyboard_vertical_correction">-81.9dp</dimen> + <dimen name="more_keys_keyboard_vertical_correction_gb">-81.9dp</dimen> <!-- left or right padding of label alignment --> <dimen name="key_label_horizontal_padding">6dp</dimen> @@ -64,7 +59,7 @@ <fraction name="key_preview_text_ratio">50%</fraction> <fraction name="spacebar_text_ratio">28.0%</fraction> <dimen name="key_preview_height">94.5dp</dimen> - <dimen name="key_preview_offset">16.0dp</dimen> + <dimen name="key_preview_offset_gb">16.0dp</dimen> <!-- For 5-row keyboard --> <fraction name="key_bottom_gap_5row">3.20%p</fraction> diff --git a/java/res/values-sw600dp/touch-position-correction.xml b/java/res/values-sw600dp/touch-position-correction.xml index f77d3ae83..df07c1295 100644 --- a/java/res/values-sw600dp/touch-position-correction.xml +++ b/java/res/values-sw600dp/touch-position-correction.xml @@ -37,7 +37,7 @@ </string-array> <string-array - name="touch_position_correction_data_gingerbread" + name="touch_position_correction_data_gb" translatable="false" > <!-- The default touch position data (See com.android.inputmethod.keyboard.ProximityInfo) @@ -48,7 +48,7 @@ </string-array> <string-array - name="touch_position_correction_data_ice_cream_sandwich" + name="touch_position_correction_data_ics" translatable="false" > <!-- The default touch position data (See com.android.inputmethod.keyboard.ProximityInfo) diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml index f4a57ffb0..0a7048060 100644 --- a/java/res/values-sw768dp-land/dimens.xml +++ b/java/res/values-sw768dp-land/dimens.xml @@ -24,15 +24,8 @@ <dimen name="keyboardHeight">365.4dp</dimen> <fraction name="minKeyboardHeight">45%p</fraction> - <fraction name="keyboard_top_padding">1.896%p</fraction> - <fraction name="keyboard_bottom_padding">0.0%p</fraction> - - <fraction name="key_bottom_gap">4.103%p</fraction> - <fraction name="key_horizontal_gap">1.034%p</fraction> - - <fraction name="key_bottom_gap_stone">3.379%p</fraction> - <fraction name="key_horizontal_gap_stone">1.062%p</fraction> - + <fraction name="keyboard_top_padding_gb">1.896%p</fraction> + <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction> <fraction name="key_bottom_gap_gb">3.896%p</fraction> <fraction name="key_horizontal_gap_gb">1.195%p</fraction> diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml index 97f11cb04..e1c07d6f8 100644 --- a/java/res/values-sw768dp/config.xml +++ b/java/res/values-sw768dp/config.xml @@ -26,8 +26,6 @@ <bool name="config_default_key_preview_popup">false</bool> <bool name="config_default_sound_enabled">true</bool> <bool name="config_auto_correction_spacebar_led_enabled">false</bool> - <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. --> - <string name="config_default_keyboard_theme_index" translatable="false">5</string> <integer name="config_max_more_keys_column">5</integer> <!-- Configuration for MainKeyboardView diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml index 91251f5a4..877e83b59 100644 --- a/java/res/values-sw768dp/dimens.xml +++ b/java/res/values-sw768dp/dimens.xml @@ -25,18 +25,12 @@ <fraction name="maxKeyboardHeight">46%p</fraction> <fraction name="minKeyboardHeight">-35.0%p</fraction> - <fraction name="keyboard_top_padding">2.291%p</fraction> - <fraction name="keyboard_bottom_padding">0.0%p</fraction> - - <fraction name="key_bottom_gap">4.270%p</fraction> - <fraction name="key_horizontal_gap">1.551%p</fraction> - - <fraction name="key_bottom_gap_stone">3.75%p</fraction> - <fraction name="key_horizontal_gap_stone">1.059%p</fraction> - + <fraction name="keyboard_top_padding_gb">2.291%p</fraction> + <fraction name="keyboard_bottom_padding_gb">0.0%p</fraction> <fraction name="key_bottom_gap_gb">4.687%p</fraction> <fraction name="key_horizontal_gap_gb">1.272%p</fraction> + <fraction name="keyboard_top_padding_ics">2.335%p</fraction> <fraction name="keyboard_bottom_padding_ics">0.0%p</fraction> <fraction name="key_bottom_gap_ics">3.312%p</fraction> <fraction name="key_horizontal_gap_ics">1.066%p</fraction> @@ -48,7 +42,7 @@ <!-- popup_key_height x 1.2 --> <dimen name="more_keys_keyboard_slide_allowance">98.3dp</dimen> <!-- popup_key_height x -1.0 --> - <dimen name="more_keys_keyboard_vertical_correction">-81.9dp</dimen> + <dimen name="more_keys_keyboard_vertical_correction_gb">-81.9dp</dimen> <!-- left or right padding of label alignment --> <dimen name="key_label_horizontal_padding">6dp</dimen> @@ -65,7 +59,7 @@ <fraction name="key_preview_text_ratio">50%</fraction> <fraction name="spacebar_text_ratio">29.03%</fraction> <dimen name="key_preview_height">94.5dp</dimen> - <dimen name="key_preview_offset">16.0dp</dimen> + <dimen name="key_preview_offset_gb">16.0dp</dimen> <!-- For 5-row keyboard --> <fraction name="key_bottom_gap_5row">2.95%p</fraction> diff --git a/java/res/values-v18/emoji-categories.xml b/java/res/values-v18/emoji-categories.xml new file mode 100644 index 000000000..17a2053d2 --- /dev/null +++ b/java/res/values-v18/emoji-categories.xml @@ -0,0 +1,922 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 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. +--> + +<!-- Note: This emoji code point list is valid on JB-MR2 (API == 18). + There is another emoji code point list for KLP and later under res/xml/values-v19. --> +<resources> + <!-- Dummy codeArrays for recents emoji keyboard. + Do not remove these keys, because they are used as a template. --> + <array + name="emoji_recents" + format="string" + > + <item>52</item> + <item>45</item> + <item>43</item> + <item>45</item> + <item>4E</item> + <item>54</item> + </array> + <array + name="emoji_nature" + format="string" + > + <!-- <item>1f415</item> --> + <item>1f436</item> + <item>1f429</item> + <!-- <item>1f408</item> --> + <item>1f431</item> + <!-- <item>1f400</item> --> + <!-- <item>1f401</item> --> + <item>1f42d</item> + <item>1f439</item> + <item>1f422</item> + <!-- <item>1f407</item> --> + <item>1f430</item> + <!-- <item>1f413</item> --> + <item>1f414</item> + <item>1f423</item> + <item>1f424</item> + <item>1f425</item> + <item>1f426</item> + <!-- <item>1f40f</item> --> + <item>1f411</item> + <!-- <item>1f410</item> --> + <item>1f43a</item> + <!-- <item>1f403</item> --> + <!-- <item>1f402</item> --> + <!-- <item>1f404</item> --> + <item>1f42e</item> + <item>1f434</item> + <item>1f417</item> + <!-- <item>1f416</item> --> + <item>1f437</item> + <item>1f43d</item> + <item>1f438</item> + <item>1f40d</item> + <item>1f43c</item> + <item>1f427</item> + <item>1f418</item> + <item>1f428</item> + <item>1f412</item> + <item>1f435</item> + <!-- <item>1f406</item> --> + <item>1f42f</item> + <item>1f43b</item> + <item>1f42b</item> + <!-- <item>1f42a</item> --> + <!-- <item>1f40a</item> --> + <item>1f433</item> + <!-- <item>1f40b</item> --> + <item>1f41f</item> + <item>1f420</item> + <item>1f421</item> + <item>1f419</item> + <item>1f41a</item> + <item>1f42c</item> + <item>1f40c</item> + <item>1f41b</item> + <item>1f41c</item> + <item>1f41d</item> + <item>1f41e</item> + <item>1f432</item> + <!-- <item>1f409</item> --> + <item>1f43e</item> + <item>1f378</item> + <item>1f37a</item> + <item>1f37b</item> + <item>1f377</item> + <item>1f379</item> + <item>1f376</item> + <!-- <item>2615</item> --> + <item>1f375</item> + <!-- <item>1f37c</item> --> + <item>1f374</item> + <item>1f368</item> + <item>1f367</item> + <item>1f366</item> + <item>1f369</item> + <item>1f370</item> + <item>1f36a</item> + <item>1f36b</item> + <item>1f36c</item> + <item>1f36d</item> + <item>1f36e</item> + <item>1f36f</item> + <item>1f373</item> + <item>1f354</item> + <item>1f35f</item> + <item>1f35d</item> + <item>1f355</item> + <item>1f356</item> + <item>1f357</item> + <item>1f364</item> + <item>1f363</item> + <item>1f371</item> + <item>1f35e</item> + <item>1f35c</item> + <item>1f359</item> + <item>1f35a</item> + <item>1f35b</item> + <item>1f372</item> + <item>1f365</item> + <item>1f362</item> + <item>1f361</item> + <item>1f358</item> + <item>1f360</item> + <item>1f34c</item> + <item>1f34e</item> + <item>1f34f</item> + <item>1f34a</item> + <!-- <item>1f34b</item> --> + <item>1f344</item> + <item>1f345</item> + <item>1f346</item> + <item>1f347</item> + <item>1f348</item> + <item>1f349</item> + <!-- <item>1f350</item> --> + <item>1f351</item> + <item>1f352</item> + <item>1f353</item> + <item>1f34d</item> + <item>1f330</item> + <item>1f331</item> + <!-- <item>1f332</item> --> + <!-- <item>1f333</item> --> + <item>1f334</item> + <item>1f335</item> + <item>1f337</item> + <item>1f338</item> + <item>1f339</item> + <item>1f340</item> + <item>1f341</item> + <item>1f342</item> + <item>1f343</item> + <item>1f33a</item> + <item>1f33b</item> + <item>1f33c</item> + <item>1f33d</item> + <item>1f33e</item> + <item>1f33f</item> + <item>2600</item> + <item>1f308</item> + <item>26c5</item> + <item>2601</item> + <item>1f301</item> + <item>1f302</item> + <!-- <item>2614</item> --> + <item>1f4a7</item> + <item>26a1</item> + <item>1f300</item> + <item>2744</item> + <item>26c4</item> + <item>1f319</item> + <!-- <item>1f31e</item> --> + <!-- <item>1f31d</item> --> + <!-- <item>1f31a</item> --> + <item>1f31b</item> + <!-- <item>1f31c</item> --> + <item>1f311</item> + <!-- <item>1f312</item> --> + <item>1f313</item> + <item>1f314</item> + <item>1f315</item> + <!-- <item>1f316</item> --> + <!-- <item>1f317</item> --> + <!-- <item>1f318</item> --> + <item>1f391</item> + <item>1f304</item> + <item>1f305</item> + <item>1f307</item> + <item>1f306</item> + <item>1f303</item> + <item>1f30c</item> + <item>1f309</item> + <item>1f30a</item> + <item>1f30b</item> + <!-- <item>1f30e</item> --> + <item>1f30f</item> + <!-- <item>1f30d</item> --> + <!-- <item>1f310</item> --> + </array> + <array + name="emoji_symbols" + format="string" + > + <!-- <item>fe82e|0031,20e3</item> --> + <!-- <item>fe82f|0032,20e3</item> --> + <!-- <item>fe830|0033,20e3</item> --> + <!-- <item>fe831|0034,20e3</item> --> + <!-- <item>fe832|0035,20e3</item> --> + <!-- <item>fe833|0036,20e3</item> --> + <!-- <item>fe834|0037,20e3</item> --> + <!-- <item>fe835|0038,20e3</item> --> + <!-- <item>fe836|0039,20e3</item> --> + <!-- <item>fe837|0030,20e3</item> --> + <!-- <item>1f51f</item> --> + <!-- <item>fe82c|0023,20e3</item> --> + <item>1f51d</item> + <item>1f519</item> + <item>1f51b</item> + <item>1f51c</item> + <item>1f51a</item> + <item>23f3</item> + <item>231b</item> + <item>23f0</item> + <item>2648</item> + <item>2649</item> + <item>264a</item> + <item>264b</item> + <item>264c</item> + <item>264d</item> + <item>264e</item> + <item>264f</item> + <item>2650</item> + <item>2651</item> + <item>2652</item> + <item>2653</item> + <item>26ce</item> + <item>1f531</item> + <item>1f52f</item> + <item>1f6bb</item> + <!-- <item>1f6ae</item> --> + <!-- <item>1f6af</item> --> + <!-- <item>1f6b0</item> --> + <!-- <item>1f6b1</item> --> + <item>1f170</item> + <item>1f171</item> + <item>1f18e</item> + <item>1f17e</item> + <item>1f4ae</item> + <item>1f4af</item> + <item>1f520</item> + <item>1f521</item> + <item>1f522</item> + <item>1f523</item> + <item>1f524</item> + <item>27bf</item> + <item>1f4f6</item> + <item>1f4f3</item> + <item>1f4f4</item> + <!-- <item>1f4f5</item> --> + <item>1f6b9</item> + <item>1f6ba</item> + <item>1f6bc</item> + <item>267f</item> + <item>267b</item> + <item>1f6ad</item> + <item>1f6a9</item> + <item>26a0</item> + <item>1f201</item> + <item>1f51e</item> + <item>26d4</item> + <item>1f192</item> + <item>1f197</item> + <item>1f195</item> + <item>1f198</item> + <item>1f199</item> + <item>1f193</item> + <item>1f196</item> + <item>1f19a</item> + <item>1f232</item> + <item>1f233</item> + <item>1f234</item> + <item>1f235</item> + <item>1f236</item> + <item>1f237</item> + <item>1f238</item> + <item>1f239</item> + <item>1f202</item> + <item>1f23a</item> + <item>1f250</item> + <item>1f251</item> + <item>3299</item> + <item>00ae</item> + <item>00a9</item> + <item>2122</item> + <item>1f21a</item> + <item>1f22f</item> + <item>3297</item> + <item>2b55</item> + <item>274c</item> + <item>274e</item> + <item>2139</item> + <item>1f6ab</item> + <item>2705</item> + <item>2714</item> + <item>1f517</item> + <item>2734</item> + <item>2733</item> + <item>2795</item> + <item>2796</item> + <item>2716</item> + <item>2797</item> + <item>1f4a0</item> + <item>1f4a1</item> + <item>1f4a4</item> + <item>1f4a2</item> + <item>1f525</item> + <item>1f4a5</item> + <item>1f4a8</item> + <item>1f4a6</item> + <item>1f4ab</item> + <item>1f55b</item> + <!-- <item>1f567</item> --> + <item>1f550</item> + <!-- <item>1f55c</item> --> + <item>1f551</item> + <!-- <item>1f55d</item> --> + <item>1f552</item> + <!-- <item>1f55e</item> --> + <item>1f553</item> + <!-- <item>1f55f</item> --> + <item>1f554</item> + <!-- <item>1f560</item> --> + <item>1f555</item> + <!-- <item>1f561</item> --> + <item>1f556</item> + <!-- <item>1f562</item> --> + <item>1f557</item> + <!-- <item>1f563</item> --> + <item>1f558</item> + <!-- <item>1f564</item> --> + <item>1f559</item> + <!-- <item>1f565</item> --> + <item>1f55a</item> + <!-- <item>1f566</item> --> + <item>2195</item> + <item>2b06</item> + <item>2197</item> + <item>27a1</item> + <item>2198</item> + <item>2b07</item> + <item>2199</item> + <item>2b05</item> + <item>2196</item> + <item>2194</item> + <item>2934</item> + <item>2935</item> + <item>23ea</item> + <item>23eb</item> + <item>23ec</item> + <item>23e9</item> + <item>25c0</item> + <item>25b6</item> + <item>1f53d</item> + <item>1f53c</item> + <item>2747</item> + <item>2728</item> + <item>1f534</item> + <item>1f535</item> + <item>26aa</item> + <item>26ab</item> + <item>1f533</item> + <item>1f532</item> + <item>2b50</item> + <item>1f31f</item> + <item>1f320</item> + <item>25ab</item> + <item>25aa</item> + <item>25fd</item> + <item>25fe</item> + <item>25fb</item> + <item>25fc</item> + <item>2b1c</item> + <item>2b1b</item> + <item>1f538</item> + <item>1f539</item> + <item>1f536</item> + <item>1f537</item> + <item>1f53a</item> + <item>1f53b</item> + <item>2754</item> + <item>2753</item> + <item>2755</item> + <item>2757</item> + <item>203c</item> + <item>2049</item> + <item>3030</item> + <item>27b0</item> + <item>2660</item> + <item>2665</item> + <item>2663</item> + <item>2666</item> + <item>1f194</item> + <item>1f511</item> + <item>21a9</item> + <item>1f191</item> + <item>1f50d</item> + <item>1f512</item> + <item>1f513</item> + <item>21aa</item> + <item>1f510</item> + <!-- <item>2611</item> --> + <item>1f518</item> + <item>1f50e</item> + <item>1f516</item> + <item>1f50f</item> + <item>1f503</item> + <!-- <item>1f500</item> --> + <!-- <item>1f501</item> --> + <!-- <item>1f502</item> --> + <!-- <item>1f504</item> --> + <item>1f4e7</item> + <!-- <item>1f505</item> --> + <!-- <item>1f506</item> --> + <!-- <item>1f507</item> --> + <!-- <item>1f508</item> --> + <!-- <item>1f509</item> --> + <item>1f50a</item> + </array> + <array + name="emoji_faces" + format="string" + > + <item>263a</item> + <item>1f60a</item> + <!-- <item>1f600</item> --> + <item>1f601</item> + <item>1f602</item> + <item>1f603</item> + <item>1f604</item> + <item>1f605</item> + <item>1f606</item> + <!-- <item>1f607</item> --> + <!-- <item>1f608</item> --> + <item>1f609</item> + <!-- <item>1f62f</item> --> + <!-- <item>1f610</item> --> + <!-- <item>1f611</item> --> + <!-- <item>1f615</item> --> + <item>1f620</item> + <!-- <item>1f62c</item> --> + <item>1f621</item> + <item>1f622</item> + <!-- <item>1f634</item> --> + <!-- <item>1f62e</item> --> + <item>1f623</item> + <item>1f624</item> + <item>1f625</item> + <!-- <item>1f626</item> --> + <!-- <item>1f627</item> --> + <item>1f628</item> + <item>1f629</item> + <item>1f630</item> + <!-- <item>1f61f</item> --> + <item>1f631</item> + <item>1f632</item> + <item>1f633</item> + <item>1f635</item> + <!-- <item>1f636</item> --> + <item>1f637</item> + <item>1f61e</item> + <item>1f612</item> + <item>1f60d</item> + <!-- <item>1f61b</item> --> + <item>1f61c</item> + <item>1f61d</item> + <item>1f60b</item> + <!-- <item>1f617</item> --> + <!-- <item>1f619</item> --> + <item>1f618</item> + <item>1f61a</item> + <!-- <item>1f60e</item> --> + <item>1f62d</item> + <item>1f60c</item> + <item>1f616</item> + <item>1f614</item> + <item>1f62a</item> + <item>1f60f</item> + <item>1f613</item> + <item>1f62b</item> + <item>1f64b</item> + <item>1f64c</item> + <item>1f64d</item> + <item>1f645</item> + <item>1f646</item> + <item>1f647</item> + <item>1f64e</item> + <item>1f64f</item> + <item>1f63a</item> + <item>1f63c</item> + <item>1f638</item> + <item>1f639</item> + <item>1f63b</item> + <item>1f63d</item> + <item>1f63f</item> + <item>1f63e</item> + <item>1f640</item> + <item>1f648</item> + <item>1f649</item> + <item>1f64a</item> + <item>1f4a9</item> + <item>1f476</item> + <item>1f466</item> + <item>1f467</item> + <item>1f468</item> + <item>1f469</item> + <item>1f474</item> + <item>1f475</item> + <item>1f48f</item> + <item>1f491</item> + <item>1f46a</item> + <item>1f46b</item> + <!-- <item>1f46c</item> --> + <!-- <item>1f46d</item> --> + <item>1f464</item> + <!-- <item>1f465</item> --> + <item>1f46e</item> + <item>1f477</item> + <item>1f481</item> + <item>1f482</item> + <item>1f46f</item> + <item>1f470</item> + <item>1f478</item> + <item>1f385</item> + <item>1f47c</item> + <!-- <item>1f471</item> --> + <!-- <item>1f472</item> --> + <!-- <item>1f473</item> --> + <item>1f483</item> + <item>1f486</item> + <item>1f487</item> + <item>1f485</item> + <item>1f47b</item> + <item>1f479</item> + <item>1f47a</item> + <item>1f47d</item> + <item>1f47e</item> + <item>1f47f</item> + <item>1f480</item> + <item>1f4aa</item> + <item>1f440</item> + <item>1f442</item> + <item>1f443</item> + <item>1f463</item> + <item>1f444</item> + <item>1f445</item> + <item>1f48b</item> + <item>2764</item> + <item>1f499</item> + <item>1f49a</item> + <item>1f49b</item> + <item>1f49c</item> + <item>1f493</item> + <item>1f494</item> + <item>1f495</item> + <item>1f496</item> + <item>1f497</item> + <item>1f498</item> + <item>1f49d</item> + <item>1f49e</item> + <item>1f49f</item> + <item>1f44d</item> + <item>1f44e</item> + <item>1f44c</item> + <item>270a</item> + <item>270c</item> + <item>270b</item> + <item>1f44a</item> + <!-- <item>261d</item> --> + <item>1f446</item> + <item>1f447</item> + <item>1f448</item> + <item>1f449</item> + <item>1f44b</item> + <item>1f44f</item> + <!-- <item>1f450</item> --> + </array> + <array + name="emoji_objects" + format="string" + > + <item>1f530</item> + <item>1f484</item> + <item>1f45e</item> + <item>1f45f</item> + <item>1f451</item> + <item>1f452</item> + <item>1f3a9</item> + <item>1f393</item> + <item>1f453</item> + <item>231a</item> + <item>1f454</item> + <item>1f455</item> + <item>1f456</item> + <item>1f457</item> + <item>1f458</item> + <item>1f459</item> + <item>1f460</item> + <item>1f461</item> + <item>1f462</item> + <item>1f45a</item> + <item>1f45c</item> + <item>1f4bc</item> + <item>1f392</item> + <item>1f45d</item> + <item>1f45b</item> + <item>1f4b0</item> + <item>1f4b3</item> + <item>1f4b2</item> + <item>1f4b5</item> + <item>1f4b4</item> + <!-- <item>1f4b6</item> --> + <!-- <item>1f4b7</item> --> + <item>1f4b8</item> + <item>1f4b1</item> + <item>1f4b9</item> + <item>1f52b</item> + <item>1f52a</item> + <item>1f4a3</item> + <item>1f489</item> + <item>1f48a</item> + <item>1f6ac</item> + <item>1f514</item> + <!-- <item>1f515</item> --> + <item>1f6aa</item> + <!-- <item>1f52c</item> --> + <!-- <item>1f52d</item> --> + <item>1f52e</item> + <item>1f526</item> + <item>1f50b</item> + <item>1f50c</item> + <item>1f4dc</item> + <item>1f4d7</item> + <item>1f4d8</item> + <item>1f4d9</item> + <item>1f4da</item> + <item>1f4d4</item> + <item>1f4d2</item> + <item>1f4d1</item> + <item>1f4d3</item> + <item>1f4d5</item> + <item>1f4d6</item> + <item>1f4f0</item> + <item>1f4db</item> + <item>1f383</item> + <item>1f384</item> + <item>1f380</item> + <item>1f381</item> + <item>1f382</item> + <item>1f388</item> + <item>1f386</item> + <item>1f387</item> + <item>1f389</item> + <item>1f38a</item> + <item>1f38d</item> + <item>1f38f</item> + <item>1f38c</item> + <item>1f390</item> + <item>1f38b</item> + <item>1f38e</item> + <item>1f4f1</item> + <item>1f4f2</item> + <item>1f4df</item> + <item>260e</item> + <item>1f4de</item> + <item>1f4e0</item> + <item>1f4e6</item> + <item>2709</item> + <item>1f4e8</item> + <item>1f4e9</item> + <item>1f4ea</item> + <item>1f4eb</item> + <!-- <item>1f4ed</item> --> + <!-- <item>1f4ec</item> --> + <item>1f4ee</item> + <item>1f4e4</item> + <item>1f4e5</item> + <!-- <item>1f4ef</item> --> + <item>1f4e2</item> + <item>1f4e3</item> + <item>1f4e1</item> + <item>1f4ac</item> + <!-- <item>1f4ad</item> --> + <item>2712</item> + <item>270f</item> + <item>1f4dd</item> + <item>1f4cf</item> + <item>1f4d0</item> + <item>1f4cd</item> + <item>1f4cc</item> + <item>1f4ce</item> + <item>2702</item> + <item>1f4ba</item> + <item>1f4bb</item> + <item>1f4bd</item> + <item>1f4be</item> + <item>1f4bf</item> + <item>1f4c6</item> + <item>1f4c5</item> + <item>1f4c7</item> + <item>1f4cb</item> + <item>1f4c1</item> + <item>1f4c2</item> + <item>1f4c3</item> + <item>1f4c4</item> + <item>1f4ca</item> + <item>1f4c8</item> + <item>1f4c9</item> + <item>26fa</item> + <item>1f3a1</item> + <item>1f3a2</item> + <item>1f3a0</item> + <item>1f3aa</item> + <item>1f3a8</item> + <item>1f3ac</item> + <item>1f3a5</item> + <item>1f4f7</item> + <item>1f4f9</item> + <item>1f3a6</item> + <item>1f3ad</item> + <item>1f3ab</item> + <item>1f3ae</item> + <item>1f3b2</item> + <item>1f3b0</item> + <item>1f0cf</item> + <item>1f3b4</item> + <item>1f004</item> + <item>1f3af</item> + <item>1f4fa</item> + <item>1f4fb</item> + <item>1f4c0</item> + <item>1f4fc</item> + <item>1f3a7</item> + <item>1f3a4</item> + <item>1f3b5</item> + <item>1f3b6</item> + <item>1f3bc</item> + <item>1f3bb</item> + <item>1f3b9</item> + <item>1f3b7</item> + <item>1f3ba</item> + <item>1f3b8</item> + <item>303d</item> + </array> + <array + name="emoji_places" + format="string" + > + <item>1f3e0</item> + <item>1f3e1</item> + <item>1f3e2</item> + <item>1f3e3</item> + <!-- <item>1f3e4</item> --> + <item>1f3e5</item> + <item>1f3e6</item> + <item>1f3e7</item> + <item>1f3e8</item> + <item>1f3e9</item> + <item>1f3ea</item> + <item>1f3eb</item> + <item>26ea</item> + <item>26f2</item> + <item>1f3ec</item> + <item>1f3ef</item> + <item>1f3f0</item> + <item>1f3ed</item> + <item>1f5fb</item> + <item>1f5fc</item> + <item>1f5fd</item> + <item>1f5fe</item> + <item>1f5ff</item> + <item>2693</item> + <item>1f3ee</item> + <item>1f488</item> + <item>1f527</item> + <item>1f528</item> + <item>1f529</item> + <!-- <item>1f6bf</item> --> + <!-- <item>1f6c1</item> --> + <item>1f6c0</item> + <item>1f6bd</item> + <item>1f6be</item> + <item>1f3bd</item> + <item>1f3a3</item> + <item>1f3b1</item> + <item>1f3b3</item> + <item>26be</item> + <item>26f3</item> + <item>1f3be</item> + <item>26bd</item> + <item>1f3bf</item> + <item>1f3c0</item> + <item>1f3c1</item> + <item>1f3c2</item> + <item>1f3c3</item> + <item>1f3c4</item> + <item>1f3c6</item> + <!-- <item>1f3c7</item> --> + <item>1f40e</item> + <item>1f3c8</item> + <!-- <item>1f3c9</item> --> + <item>1f3ca</item> + <!-- <item>1f682</item> --> + <item>1f683</item> + <item>1f684</item> + <item>1f685</item> + <!-- <item>1f686</item> --> + <item>1f687</item> + <item>24c2</item> + <!-- <item>1f688</item> --> + <!-- <item>1f68a</item> --> + <!-- <item>1f68b</item> --> + <item>1f68c</item> + <!-- <item>1f68d</item> --> + <!-- <item>1f68e</item> --> + <item>1f68f</item> + <!-- <item>1f690</item> --> + <item>1f691</item> + <item>1f692</item> + <item>1f693</item> + <!-- <item>1f694</item> --> + <item>1f695</item> + <!-- <item>1f696</item> --> + <item>1f697</item> + <!-- <item>1f698</item> --> + <item>1f699</item> + <!-- <item>1f69a</item> --> + <!-- <item>1f69b</item> --> + <!-- <item>1f69c</item> --> + <!-- <item>1f69d</item> --> + <!-- <item>1f69e</item> --> + <!-- <item>1f69f</item> --> + <!-- <item>1f6a0</item> --> + <!-- <item>1f6a1</item> --> + <item>1f6a2</item> + <!-- <item>1f6a3</item> --> + <!-- <item>1f681</item> --> + <item>2708</item> + <!-- <item>1f6c2</item> --> + <!-- <item>1f6c3</item> --> + <!-- <item>1f6c4</item> --> + <!-- <item>1f6c5</item> --> + <item>26f5</item> + <item>1f6b2</item> + <!-- <item>1f6b3</item> --> + <!-- <item>1f6b4</item> --> + <!-- <item>1f6b5</item> --> + <!-- <item>1f6b7</item> --> + <!-- <item>1f6b8</item> --> + <item>1f689</item> + <item>1f680</item> + <item>1f6a4</item> + <item>1f6b6</item> + <item>26fd</item> + <item>1f17f</item> + <item>1f6a5</item> + <!-- <item>1f6a6</item> --> + <item>1f6a7</item> + <item>1f6a8</item> + <item>2668</item> + <item>1f48c</item> + <item>1f48d</item> + <item>1f48e</item> + <item>1f490</item> + <item>1f492</item> + <item>fe4e5|1f1ef,1f1f5</item> + <item>fe4e6|1f1fa,1f1f8</item> + <item>fe4e7|1f1eb,1f1f7</item> + <item>fe4e8|1f1e9,1f1ea</item> + <item>fe4e9|1f1ee,1f1f9</item> + <item>fe4ea|1f1ec,1f1e7</item> + <item>fe4eb|1f1ea,1f1f8</item> + <item>fe4ec|1f1f7,1f1fa</item> + <item>fe4ed|1f1e8,1f1f3</item> + <item>fe4ee|1f1f0,1f1f7</item> + </array> + <array + name="emoji_emoticons" + format="string" + > + <item>=-O</item> + <item>:-P</item> + <item>;-)</item> + <item>:-(</item> + <item>:-)</item> + <item>:-!</item> + <item>:-$</item> + <item>B-)</item> + <item>:O</item> + <item>:-*</item> + <item>:-D</item> + <item>:\'(</item> + <item>:-\\</item> + <item>O:-)</item> + <item>:-[</item> + </array> +</resources> diff --git a/java/res/values-v19/emoji-categories.xml b/java/res/values-v19/emoji-categories.xml new file mode 100644 index 000000000..a6affc421 --- /dev/null +++ b/java/res/values-v19/emoji-categories.xml @@ -0,0 +1,922 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 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. +--> + +<!-- Note: This emoji code point list is valid on KLP and later (API >= 19). + There is another emoji code point list for JB-MR2 under res/xml/values and values-v18.--> +<resources> + <!-- Dummy codeArrays for recents emoji keyboard. + Do not remove these keys, because they are used as a template. --> + <array + name="emoji_recents" + format="string" + > + <item>52</item> + <item>45</item> + <item>43</item> + <item>45</item> + <item>4E</item> + <item>54</item> + </array> + <array + name="emoji_nature" + format="string" + > + <item>1f415</item> + <item>1f436</item> + <item>1f429</item> + <item>1f408</item> + <item>1f431</item> + <item>1f400</item> + <item>1f401</item> + <item>1f42d</item> + <item>1f439</item> + <item>1f422</item> + <item>1f407</item> + <item>1f430</item> + <item>1f413</item> + <item>1f414</item> + <item>1f423</item> + <item>1f424</item> + <item>1f425</item> + <item>1f426</item> + <item>1f40f</item> + <item>1f411</item> + <item>1f410</item> + <item>1f43a</item> + <item>1f403</item> + <item>1f402</item> + <item>1f404</item> + <item>1f42e</item> + <item>1f434</item> + <item>1f417</item> + <item>1f416</item> + <item>1f437</item> + <item>1f43d</item> + <item>1f438</item> + <item>1f40d</item> + <item>1f43c</item> + <item>1f427</item> + <item>1f418</item> + <item>1f428</item> + <item>1f412</item> + <item>1f435</item> + <item>1f406</item> + <item>1f42f</item> + <item>1f43b</item> + <item>1f42b</item> + <item>1f42a</item> + <item>1f40a</item> + <item>1f433</item> + <item>1f40b</item> + <item>1f41f</item> + <item>1f420</item> + <item>1f421</item> + <item>1f419</item> + <item>1f41a</item> + <item>1f42c</item> + <item>1f40c</item> + <item>1f41b</item> + <item>1f41c</item> + <item>1f41d</item> + <item>1f41e</item> + <item>1f432</item> + <item>1f409</item> + <item>1f43e</item> + <item>1f378</item> + <item>1f37a</item> + <item>1f37b</item> + <item>1f377</item> + <item>1f379</item> + <item>1f376</item> + <item>2615</item> + <item>1f375</item> + <item>1f37c</item> + <item>1f374</item> + <item>1f368</item> + <item>1f367</item> + <item>1f366</item> + <item>1f369</item> + <item>1f370</item> + <item>1f36a</item> + <item>1f36b</item> + <item>1f36c</item> + <item>1f36d</item> + <item>1f36e</item> + <item>1f36f</item> + <item>1f373</item> + <item>1f354</item> + <item>1f35f</item> + <item>1f35d</item> + <item>1f355</item> + <item>1f356</item> + <item>1f357</item> + <item>1f364</item> + <item>1f363</item> + <item>1f371</item> + <item>1f35e</item> + <item>1f35c</item> + <item>1f359</item> + <item>1f35a</item> + <item>1f35b</item> + <item>1f372</item> + <item>1f365</item> + <item>1f362</item> + <item>1f361</item> + <item>1f358</item> + <item>1f360</item> + <item>1f34c</item> + <item>1f34e</item> + <item>1f34f</item> + <item>1f34a</item> + <item>1f34b</item> + <item>1f344</item> + <item>1f345</item> + <item>1f346</item> + <item>1f347</item> + <item>1f348</item> + <item>1f349</item> + <item>1f350</item> + <item>1f351</item> + <item>1f352</item> + <item>1f353</item> + <item>1f34d</item> + <item>1f330</item> + <item>1f331</item> + <item>1f332</item> + <item>1f333</item> + <item>1f334</item> + <item>1f335</item> + <item>1f337</item> + <item>1f338</item> + <item>1f339</item> + <item>1f340</item> + <item>1f341</item> + <item>1f342</item> + <item>1f343</item> + <item>1f33a</item> + <item>1f33b</item> + <item>1f33c</item> + <item>1f33d</item> + <item>1f33e</item> + <item>1f33f</item> + <item>2600</item> + <item>1f308</item> + <item>26c5</item> + <item>2601</item> + <item>1f301</item> + <item>1f302</item> + <item>2614</item> + <item>1f4a7</item> + <item>26a1</item> + <item>1f300</item> + <item>2744</item> + <item>26c4</item> + <item>1f319</item> + <item>1f31e</item> + <item>1f31d</item> + <item>1f31a</item> + <item>1f31b</item> + <item>1f31c</item> + <item>1f311</item> + <item>1f312</item> + <item>1f313</item> + <item>1f314</item> + <item>1f315</item> + <item>1f316</item> + <item>1f317</item> + <item>1f318</item> + <item>1f391</item> + <item>1f304</item> + <item>1f305</item> + <item>1f307</item> + <item>1f306</item> + <item>1f303</item> + <item>1f30c</item> + <item>1f309</item> + <item>1f30a</item> + <item>1f30b</item> + <item>1f30e</item> + <item>1f30f</item> + <item>1f30d</item> + <item>1f310</item> + </array> + <array + name="emoji_symbols" + format="string" + > + <item>fe82e|0031,20e3</item> + <item>fe82f|0032,20e3</item> + <item>fe830|0033,20e3</item> + <item>fe831|0034,20e3</item> + <item>fe832|0035,20e3</item> + <item>fe833|0036,20e3</item> + <item>fe834|0037,20e3</item> + <item>fe835|0038,20e3</item> + <item>fe836|0039,20e3</item> + <item>fe837|0030,20e3</item> + <item>1f51f</item> + <item>fe82c|0023,20e3</item> + <item>1f51d</item> + <item>1f519</item> + <item>1f51b</item> + <item>1f51c</item> + <item>1f51a</item> + <item>23f3</item> + <item>231b</item> + <item>23f0</item> + <item>2648</item> + <item>2649</item> + <item>264a</item> + <item>264b</item> + <item>264c</item> + <item>264d</item> + <item>264e</item> + <item>264f</item> + <item>2650</item> + <item>2651</item> + <item>2652</item> + <item>2653</item> + <item>26ce</item> + <item>1f531</item> + <item>1f52f</item> + <item>1f6bb</item> + <item>1f6ae</item> + <item>1f6af</item> + <item>1f6b0</item> + <item>1f6b1</item> + <item>1f170</item> + <item>1f171</item> + <item>1f18e</item> + <item>1f17e</item> + <item>1f4ae</item> + <item>1f4af</item> + <item>1f520</item> + <item>1f521</item> + <item>1f522</item> + <item>1f523</item> + <item>1f524</item> + <item>27bf</item> + <item>1f4f6</item> + <item>1f4f3</item> + <item>1f4f4</item> + <item>1f4f5</item> + <item>1f6b9</item> + <item>1f6ba</item> + <item>1f6bc</item> + <item>267f</item> + <item>267b</item> + <item>1f6ad</item> + <item>1f6a9</item> + <item>26a0</item> + <item>1f201</item> + <item>1f51e</item> + <item>26d4</item> + <item>1f192</item> + <item>1f197</item> + <item>1f195</item> + <item>1f198</item> + <item>1f199</item> + <item>1f193</item> + <item>1f196</item> + <item>1f19a</item> + <item>1f232</item> + <item>1f233</item> + <item>1f234</item> + <item>1f235</item> + <item>1f236</item> + <item>1f237</item> + <item>1f238</item> + <item>1f239</item> + <item>1f202</item> + <item>1f23a</item> + <item>1f250</item> + <item>1f251</item> + <item>3299</item> + <item>00ae</item> + <item>00a9</item> + <item>2122</item> + <item>1f21a</item> + <item>1f22f</item> + <item>3297</item> + <item>2b55</item> + <item>274c</item> + <item>274e</item> + <item>2139</item> + <item>1f6ab</item> + <item>2705</item> + <item>2714</item> + <item>1f517</item> + <item>2734</item> + <item>2733</item> + <item>2795</item> + <item>2796</item> + <item>2716</item> + <item>2797</item> + <item>1f4a0</item> + <item>1f4a1</item> + <item>1f4a4</item> + <item>1f4a2</item> + <item>1f525</item> + <item>1f4a5</item> + <item>1f4a8</item> + <item>1f4a6</item> + <item>1f4ab</item> + <item>1f55b</item> + <item>1f567</item> + <item>1f550</item> + <item>1f55c</item> + <item>1f551</item> + <item>1f55d</item> + <item>1f552</item> + <item>1f55e</item> + <item>1f553</item> + <item>1f55f</item> + <item>1f554</item> + <item>1f560</item> + <item>1f555</item> + <item>1f561</item> + <item>1f556</item> + <item>1f562</item> + <item>1f557</item> + <item>1f563</item> + <item>1f558</item> + <item>1f564</item> + <item>1f559</item> + <item>1f565</item> + <item>1f55a</item> + <item>1f566</item> + <item>2195</item> + <item>2b06</item> + <item>2197</item> + <item>27a1</item> + <item>2198</item> + <item>2b07</item> + <item>2199</item> + <item>2b05</item> + <item>2196</item> + <item>2194</item> + <item>2934</item> + <item>2935</item> + <item>23ea</item> + <item>23eb</item> + <item>23ec</item> + <item>23e9</item> + <item>25c0</item> + <item>25b6</item> + <item>1f53d</item> + <item>1f53c</item> + <item>2747</item> + <item>2728</item> + <item>1f534</item> + <item>1f535</item> + <item>26aa</item> + <item>26ab</item> + <item>1f533</item> + <item>1f532</item> + <item>2b50</item> + <item>1f31f</item> + <item>1f320</item> + <item>25ab</item> + <item>25aa</item> + <item>25fd</item> + <item>25fe</item> + <item>25fb</item> + <item>25fc</item> + <item>2b1c</item> + <item>2b1b</item> + <item>1f538</item> + <item>1f539</item> + <item>1f536</item> + <item>1f537</item> + <item>1f53a</item> + <item>1f53b</item> + <item>2754</item> + <item>2753</item> + <item>2755</item> + <item>2757</item> + <item>203c</item> + <item>2049</item> + <item>3030</item> + <item>27b0</item> + <item>2660</item> + <item>2665</item> + <item>2663</item> + <item>2666</item> + <item>1f194</item> + <item>1f511</item> + <item>21a9</item> + <item>1f191</item> + <item>1f50d</item> + <item>1f512</item> + <item>1f513</item> + <item>21aa</item> + <item>1f510</item> + <item>2611</item> + <item>1f518</item> + <item>1f50e</item> + <item>1f516</item> + <item>1f50f</item> + <item>1f503</item> + <item>1f500</item> + <item>1f501</item> + <item>1f502</item> + <item>1f504</item> + <item>1f4e7</item> + <item>1f505</item> + <item>1f506</item> + <item>1f507</item> + <item>1f508</item> + <item>1f509</item> + <item>1f50a</item> + </array> + <array + name="emoji_faces" + format="string" + > + <item>263a</item> + <item>1f60a</item> + <item>1f600</item> + <item>1f601</item> + <item>1f602</item> + <item>1f603</item> + <item>1f604</item> + <item>1f605</item> + <item>1f606</item> + <item>1f607</item> + <item>1f608</item> + <item>1f609</item> + <item>1f62f</item> + <item>1f610</item> + <item>1f611</item> + <item>1f615</item> + <item>1f620</item> + <item>1f62c</item> + <item>1f621</item> + <item>1f622</item> + <item>1f634</item> + <item>1f62e</item> + <item>1f623</item> + <item>1f624</item> + <item>1f625</item> + <item>1f626</item> + <item>1f627</item> + <item>1f628</item> + <item>1f629</item> + <item>1f630</item> + <item>1f61f</item> + <item>1f631</item> + <item>1f632</item> + <item>1f633</item> + <item>1f635</item> + <item>1f636</item> + <item>1f637</item> + <item>1f61e</item> + <item>1f612</item> + <item>1f60d</item> + <item>1f61b</item> + <item>1f61c</item> + <item>1f61d</item> + <item>1f60b</item> + <item>1f617</item> + <item>1f619</item> + <item>1f618</item> + <item>1f61a</item> + <item>1f60e</item> + <item>1f62d</item> + <item>1f60c</item> + <item>1f616</item> + <item>1f614</item> + <item>1f62a</item> + <item>1f60f</item> + <item>1f613</item> + <item>1f62b</item> + <item>1f64b</item> + <item>1f64c</item> + <item>1f64d</item> + <item>1f645</item> + <item>1f646</item> + <item>1f647</item> + <item>1f64e</item> + <item>1f64f</item> + <item>1f63a</item> + <item>1f63c</item> + <item>1f638</item> + <item>1f639</item> + <item>1f63b</item> + <item>1f63d</item> + <item>1f63f</item> + <item>1f63e</item> + <item>1f640</item> + <item>1f648</item> + <item>1f649</item> + <item>1f64a</item> + <item>1f4a9</item> + <item>1f476</item> + <item>1f466</item> + <item>1f467</item> + <item>1f468</item> + <item>1f469</item> + <item>1f474</item> + <item>1f475</item> + <item>1f48f</item> + <item>1f491</item> + <item>1f46a</item> + <item>1f46b</item> + <item>1f46c</item> + <item>1f46d</item> + <item>1f464</item> + <item>1f465</item> + <item>1f46e</item> + <item>1f477</item> + <item>1f481</item> + <item>1f482</item> + <item>1f46f</item> + <item>1f470</item> + <item>1f478</item> + <item>1f385</item> + <item>1f47c</item> + <item>1f471</item> + <item>1f472</item> + <item>1f473</item> + <item>1f483</item> + <item>1f486</item> + <item>1f487</item> + <item>1f485</item> + <item>1f47b</item> + <item>1f479</item> + <item>1f47a</item> + <item>1f47d</item> + <item>1f47e</item> + <item>1f47f</item> + <item>1f480</item> + <item>1f4aa</item> + <item>1f440</item> + <item>1f442</item> + <item>1f443</item> + <item>1f463</item> + <item>1f444</item> + <item>1f445</item> + <item>1f48b</item> + <item>2764</item> + <item>1f499</item> + <item>1f49a</item> + <item>1f49b</item> + <item>1f49c</item> + <item>1f493</item> + <item>1f494</item> + <item>1f495</item> + <item>1f496</item> + <item>1f497</item> + <item>1f498</item> + <item>1f49d</item> + <item>1f49e</item> + <item>1f49f</item> + <item>1f44d</item> + <item>1f44e</item> + <item>1f44c</item> + <item>270a</item> + <item>270c</item> + <item>270b</item> + <item>1f44a</item> + <item>261d</item> + <item>1f446</item> + <item>1f447</item> + <item>1f448</item> + <item>1f449</item> + <item>1f44b</item> + <item>1f44f</item> + <item>1f450</item> + </array> + <array + name="emoji_objects" + format="string" + > + <item>1f530</item> + <item>1f484</item> + <item>1f45e</item> + <item>1f45f</item> + <item>1f451</item> + <item>1f452</item> + <item>1f3a9</item> + <item>1f393</item> + <item>1f453</item> + <item>231a</item> + <item>1f454</item> + <item>1f455</item> + <item>1f456</item> + <item>1f457</item> + <item>1f458</item> + <item>1f459</item> + <item>1f460</item> + <item>1f461</item> + <item>1f462</item> + <item>1f45a</item> + <item>1f45c</item> + <item>1f4bc</item> + <item>1f392</item> + <item>1f45d</item> + <item>1f45b</item> + <item>1f4b0</item> + <item>1f4b3</item> + <item>1f4b2</item> + <item>1f4b5</item> + <item>1f4b4</item> + <item>1f4b6</item> + <item>1f4b7</item> + <item>1f4b8</item> + <item>1f4b1</item> + <item>1f4b9</item> + <item>1f52b</item> + <item>1f52a</item> + <item>1f4a3</item> + <item>1f489</item> + <item>1f48a</item> + <item>1f6ac</item> + <item>1f514</item> + <item>1f515</item> + <item>1f6aa</item> + <item>1f52c</item> + <item>1f52d</item> + <item>1f52e</item> + <item>1f526</item> + <item>1f50b</item> + <item>1f50c</item> + <item>1f4dc</item> + <item>1f4d7</item> + <item>1f4d8</item> + <item>1f4d9</item> + <item>1f4da</item> + <item>1f4d4</item> + <item>1f4d2</item> + <item>1f4d1</item> + <item>1f4d3</item> + <item>1f4d5</item> + <item>1f4d6</item> + <item>1f4f0</item> + <item>1f4db</item> + <item>1f383</item> + <item>1f384</item> + <item>1f380</item> + <item>1f381</item> + <item>1f382</item> + <item>1f388</item> + <item>1f386</item> + <item>1f387</item> + <item>1f389</item> + <item>1f38a</item> + <item>1f38d</item> + <item>1f38f</item> + <item>1f38c</item> + <item>1f390</item> + <item>1f38b</item> + <item>1f38e</item> + <item>1f4f1</item> + <item>1f4f2</item> + <item>1f4df</item> + <item>260e</item> + <item>1f4de</item> + <item>1f4e0</item> + <item>1f4e6</item> + <item>2709</item> + <item>1f4e8</item> + <item>1f4e9</item> + <item>1f4ea</item> + <item>1f4eb</item> + <item>1f4ed</item> + <item>1f4ec</item> + <item>1f4ee</item> + <item>1f4e4</item> + <item>1f4e5</item> + <item>1f4ef</item> + <item>1f4e2</item> + <item>1f4e3</item> + <item>1f4e1</item> + <item>1f4ac</item> + <item>1f4ad</item> + <item>2712</item> + <item>270f</item> + <item>1f4dd</item> + <item>1f4cf</item> + <item>1f4d0</item> + <item>1f4cd</item> + <item>1f4cc</item> + <item>1f4ce</item> + <item>2702</item> + <item>1f4ba</item> + <item>1f4bb</item> + <item>1f4bd</item> + <item>1f4be</item> + <item>1f4bf</item> + <item>1f4c6</item> + <item>1f4c5</item> + <item>1f4c7</item> + <item>1f4cb</item> + <item>1f4c1</item> + <item>1f4c2</item> + <item>1f4c3</item> + <item>1f4c4</item> + <item>1f4ca</item> + <item>1f4c8</item> + <item>1f4c9</item> + <item>26fa</item> + <item>1f3a1</item> + <item>1f3a2</item> + <item>1f3a0</item> + <item>1f3aa</item> + <item>1f3a8</item> + <item>1f3ac</item> + <item>1f3a5</item> + <item>1f4f7</item> + <item>1f4f9</item> + <item>1f3a6</item> + <item>1f3ad</item> + <item>1f3ab</item> + <item>1f3ae</item> + <item>1f3b2</item> + <item>1f3b0</item> + <item>1f0cf</item> + <item>1f3b4</item> + <item>1f004</item> + <item>1f3af</item> + <item>1f4fa</item> + <item>1f4fb</item> + <item>1f4c0</item> + <item>1f4fc</item> + <item>1f3a7</item> + <item>1f3a4</item> + <item>1f3b5</item> + <item>1f3b6</item> + <item>1f3bc</item> + <item>1f3bb</item> + <item>1f3b9</item> + <item>1f3b7</item> + <item>1f3ba</item> + <item>1f3b8</item> + <item>303d</item> + </array> + <array + name="emoji_places" + format="string" + > + <item>1f3e0</item> + <item>1f3e1</item> + <item>1f3e2</item> + <item>1f3e3</item> + <item>1f3e4</item> + <item>1f3e5</item> + <item>1f3e6</item> + <item>1f3e7</item> + <item>1f3e8</item> + <item>1f3e9</item> + <item>1f3ea</item> + <item>1f3eb</item> + <item>26ea</item> + <item>26f2</item> + <item>1f3ec</item> + <item>1f3ef</item> + <item>1f3f0</item> + <item>1f3ed</item> + <item>1f5fb</item> + <item>1f5fc</item> + <item>1f5fd</item> + <item>1f5fe</item> + <item>1f5ff</item> + <item>2693</item> + <item>1f3ee</item> + <item>1f488</item> + <item>1f527</item> + <item>1f528</item> + <item>1f529</item> + <item>1f6bf</item> + <item>1f6c1</item> + <item>1f6c0</item> + <item>1f6bd</item> + <item>1f6be</item> + <item>1f3bd</item> + <item>1f3a3</item> + <item>1f3b1</item> + <item>1f3b3</item> + <item>26be</item> + <item>26f3</item> + <item>1f3be</item> + <item>26bd</item> + <item>1f3bf</item> + <item>1f3c0</item> + <item>1f3c1</item> + <item>1f3c2</item> + <item>1f3c3</item> + <item>1f3c4</item> + <item>1f3c6</item> + <item>1f3c7</item> + <item>1f40e</item> + <item>1f3c8</item> + <item>1f3c9</item> + <item>1f3ca</item> + <item>1f682</item> + <item>1f683</item> + <item>1f684</item> + <item>1f685</item> + <item>1f686</item> + <item>1f687</item> + <item>24c2</item> + <item>1f688</item> + <item>1f68a</item> + <item>1f68b</item> + <item>1f68c</item> + <item>1f68d</item> + <item>1f68e</item> + <item>1f68f</item> + <item>1f690</item> + <item>1f691</item> + <item>1f692</item> + <item>1f693</item> + <item>1f694</item> + <item>1f695</item> + <item>1f696</item> + <item>1f697</item> + <item>1f698</item> + <item>1f699</item> + <item>1f69a</item> + <item>1f69b</item> + <item>1f69c</item> + <item>1f69d</item> + <item>1f69e</item> + <item>1f69f</item> + <item>1f6a0</item> + <item>1f6a1</item> + <item>1f6a2</item> + <item>1f6a3</item> + <item>1f681</item> + <item>2708</item> + <item>1f6c2</item> + <item>1f6c3</item> + <item>1f6c4</item> + <item>1f6c5</item> + <item>26f5</item> + <item>1f6b2</item> + <item>1f6b3</item> + <item>1f6b4</item> + <item>1f6b5</item> + <item>1f6b7</item> + <item>1f6b8</item> + <item>1f689</item> + <item>1f680</item> + <item>1f6a4</item> + <item>1f6b6</item> + <item>26fd</item> + <item>1f17f</item> + <item>1f6a5</item> + <item>1f6a6</item> + <item>1f6a7</item> + <item>1f6a8</item> + <item>2668</item> + <item>1f48c</item> + <item>1f48d</item> + <item>1f48e</item> + <item>1f490</item> + <item>1f492</item> + <item>fe4e5|1f1ef,1f1f5</item> + <item>fe4e6|1f1fa,1f1f8</item> + <item>fe4e7|1f1eb,1f1f7</item> + <item>fe4e8|1f1e9,1f1ea</item> + <item>fe4e9|1f1ee,1f1f9</item> + <item>fe4ea|1f1ec,1f1e7</item> + <item>fe4eb|1f1ea,1f1f8</item> + <item>fe4ec|1f1f7,1f1fa</item> + <item>fe4ed|1f1e8,1f1f3</item> + <item>fe4ee|1f1f0,1f1f7</item> + </array> + <array + name="emoji_emoticons" + format="string" + > + <item>=-O</item> + <item>:-P</item> + <item>;-)</item> + <item>:-(</item> + <item>:-)</item> + <item>:-!</item> + <item>:-$</item> + <item>B-)</item> + <item>:O</item> + <item>:-*</item> + <item>:-D</item> + <item>:\'(</item> + <item>:-\\</item> + <item>O:-)</item> + <item>:-[</item> + </array> +</resources> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 5c59f5f68..159a64adc 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -1,17 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. +<!-- +/* +** +** Copyright 2010, 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> @@ -26,11 +30,12 @@ <attr name="moreKeysKeyboardStyle" format="reference" /> <!-- MoreKeysKeyboardView style --> <attr name="moreKeysKeyboardViewStyle" format="reference" /> - <attr name="moreKeysKeyboardPanelStyle" format="reference" /> <!-- Suggestions strip style --> <attr name="suggestionStripViewStyle" format="reference" /> - <attr name="moreSuggestionsViewStyle" format="reference" /> - <attr name="suggestionBackgroundStyle" format="reference" /> + <!-- Styled attributes for android:background --> + <attr name="moreKeysKeyboardBackground" format="reference" /> + <attr name="suggestionStripBackground" format="reference" /> + <attr name="suggestionBackground" format="reference" /> </declare-styleable> <declare-styleable name="KeyboardView"> @@ -169,10 +174,6 @@ <attr name="colorTypedWord" format="color" /> <attr name="colorAutoCorrect" format="color" /> <attr name="colorSuggested" format="color" /> - <attr name="alphaValidTypedWord" format="fraction" /> - <attr name="alphaTypedWord" format="fraction" /> - <attr name="alphaAutoCorrect" format="fraction" /> - <attr name="alphaSuggested" format="fraction" /> <attr name="alphaObsoleted" format="fraction" /> <attr name="suggestionsCountInStrip" format="integer" /> <attr name="centerSuggestionPercentile" format="fraction" /> @@ -219,6 +220,11 @@ <attr name="iconEmojiKey" format="reference" /> </declare-styleable> + <declare-styleable name="Keyboard_GridRows"> + <attr name="codesArray" format="reference" /> + <attr name="textsArray" format="reference" /> + </declare-styleable> + <declare-styleable name="Keyboard_Key"> <!-- The unicode value that this key outputs. Code value represented in hexadecimal prefixed with "0x" or code value reference using @@ -374,10 +380,16 @@ <enum name="alphabetShiftLocked" value="3" /> <enum name="alphabetShiftLockShifted" value="4" /> <enum name="symbols" value="5" /> - <enum name="symbolsShifted" value="6" /> <enum name="phone" value="7" /> <enum name="phoneSymbols" value="8" /> <enum name="number" value="9" /> + <enum name="emojiRecents" value="10" /> + <enum name="emojiCategory1" value="11" /> + <enum name="emojiCategory2" value="12" /> + <enum name="emojiCategory3" value="13" /> + <enum name="emojiCategory4" value="14" /> + <enum name="emojiCategory5" value="15" /> + <enum name="emojiCategory6" value="16" /> </attr> <!-- This should be aligned with KeyboardId.MODE_* --> <attr name="mode" format="enum|string"> @@ -429,10 +441,16 @@ <enum name="alphabetShiftLocked" value="3" /> <enum name="alphabetShiftLockShifted" value="4" /> <enum name="symbols" value="5" /> - <enum name="symbolsShifted" value="6" /> <enum name="phone" value="7" /> <enum name="phoneSymbols" value="8" /> <enum name="number" value="9" /> + <enum name="emojiRecents" value="10" /> + <enum name="emojiCategory1" value="11" /> + <enum name="emojiCategory2" value="12" /> + <enum name="emojiCategory3" value="13" /> + <enum name="emojiCategory4" value="14" /> + <enum name="emojiCategory5" value="15" /> + <enum name="emojiCategory6" value="16" /> </attr> <attr name="elementKeyboard" format="reference"/> <!-- Enable proximity characters correction. Disabled by default. --> diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml index daa167c8a..ea762f977 100644 --- a/java/res/values/colors.xml +++ b/java/res/values/colors.xml @@ -1,47 +1,43 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. +<!-- +/* +** +** Copyright 2012, 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"> - <!-- Color resources for default, and Gingerbread theme. --> - <color name="highlight_color_default">#FFFCAE00</color> - <color name="highlight_translucent_color_default">#99FCAE00</color> - <color name="key_text_color_default">@android:color/white</color> - <color name="key_text_shadow_color_default">#BB000000</color> - <color name="key_text_inactivated_color_default">@android:color/white</color> - <color name="key_hint_letter_color_default">#80000000</color> - <color name="key_hint_label_color_default">#E0E0E4E5</color> - <color name="key_shifted_letter_hint_inactivated_color_default">#66E0E4E5</color> - <color name="key_shifted_letter_hint_activated_color_default">#CCE0E4E5</color> - <color name="spacebar_text_color_default">#FFC0C0C0</color> - <color name="spacebar_text_shadow_color_default">#80000000</color> - <color name="typed_word_color_default">@android:color/white</color> - <color name="gesture_floating_preview_color_default">#C0000000</color> - <!-- Color resources for Stone theme. --> - <color name="key_text_color_stone">@android:color/black</color> - <color name="key_text_shadow_color_stone">@android:color/white</color> - <color name="key_text_inactivated_color_stone">#FF808080</color> - <color name="key_hint_letter_color_stone">#80000000</color> - <color name="key_hint_label_color_stone">#E0000000</color> - <color name="key_shifted_letter_hint_inactivated_color_stone">#66000000</color> - <color name="key_shifted_letter_hint_activated_color_stone">#CC000000</color> - <color name="spacebar_text_color_stone">@android:color/black</color> - <color name="spacebar_text_shadow_color_stone">#D0FFFFFF</color> + <!-- Color resources for Gingerbread theme. --> + <color name="highlight_color_gb">#FFFCAE00</color> + <color name="typed_word_color_gb">@android:color/white</color> + <color name="highlight_translucent_color_gb">#99FCAE00</color> + <color name="key_text_color_gb">@android:color/white</color> + <color name="key_text_shadow_color_gb">#BB000000</color> + <color name="key_text_inactivated_color_gb">#66E0E4E5</color> + <color name="key_hint_letter_color_gb">#80000000</color> + <color name="key_hint_label_color_gb">#E0E0E4E5</color> + <color name="key_shifted_letter_hint_inactivated_color_gb">#66E0E4E5</color> + <color name="key_shifted_letter_hint_activated_color_gb">#CCE0E4E5</color> + <color name="spacebar_text_color_gb">#FFC0C0C0</color> + <color name="spacebar_text_shadow_color_gb">#80000000</color> + <color name="gesture_floating_preview_color_gb">#C0000000</color> <!-- Color resources for IceCreamSandwich theme. --> <!-- android:color/holo_blue_light value is #FF33B5E5 --> - <color name="highlight_color_ics">@android:color/holo_blue_light</color> + <color name="highlight_color_ics">#FF33B5E5</color> + <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_color_ics">@android:color/white</color> <color name="key_text_shadow_color_ics">@android:color/transparent</color> @@ -52,7 +48,7 @@ <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="typed_word_color_ics">@color/highlight_color_ics</color> + <color name="gesture_floating_preview_color_ics">#C0000000</color> <!-- Color resources for setup wizard and tutorial --> <color name="setup_background">#FFEBEBEB</color> <color name="setup_text_dark">#FF707070</color> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index d3a21f2aa..465d52cec 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -42,7 +42,7 @@ <integer name="config_keyboard_grid_height">16</integer> <integer name="config_double_space_period_timeout">1100</integer> <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. --> - <string name="config_default_keyboard_theme_index" translatable="false">5</string> + <string name="config_default_keyboard_theme_index" translatable="false">0</string> <integer name="config_max_more_keys_column">5</integer> <!-- diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index 98ae76cb1..599af124c 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -29,18 +29,11 @@ <dimen name="more_keys_keyboard_key_horizontal_padding">8dp</dimen> - <fraction name="keyboard_top_padding">1.556%p</fraction> - <fraction name="keyboard_bottom_padding">4.669%p</fraction> <fraction name="keyboard_left_padding">0%p</fraction> <fraction name="keyboard_right_padding">0%p</fraction> - <fraction name="key_bottom_gap">6.250%p</fraction> - <fraction name="key_horizontal_gap">1.352%p</fraction> - - <fraction name="keyboard_top_padding_stone">1.556%p</fraction> - <fraction name="keyboard_bottom_padding_stone">0.778%p</fraction> - <fraction name="key_bottom_gap_stone">7.506%p</fraction> - <fraction name="key_horizontal_gap_stone">1.739%p</fraction> + <fraction name="keyboard_top_padding_gb">1.556%p</fraction> + <fraction name="keyboard_bottom_padding_gb">4.669%p</fraction> <fraction name="key_bottom_gap_gb">6.495%p</fraction> <fraction name="key_horizontal_gap_gb">1.971%p</fraction> @@ -48,13 +41,12 @@ <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> - <dimen name="more_keys_keyboard_horizontal_edges_padding_ics">4dp</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> <dimen name="more_keys_keyboard_slide_allowance">63.36dp</dimen> <!-- popup_key_height x -1.0 --> - <dimen name="more_keys_keyboard_vertical_correction">-52.8dp</dimen> + <dimen name="more_keys_keyboard_vertical_correction_gb">-52.8dp</dimen> <dimen name="keyboard_vertical_correction">0.0dp</dimen> <fraction name="key_letter_ratio">55%</fraction> @@ -67,7 +59,7 @@ <fraction name="key_preview_text_ratio">82%</fraction> <fraction name="spacebar_text_ratio">33.735%</fraction> <dimen name="key_preview_height">80dp</dimen> - <dimen name="key_preview_offset">-8.0dp</dimen> + <dimen name="key_preview_offset_gb">-8.0dp</dimen> <dimen name="key_label_horizontal_padding">4dp</dimen> <dimen name="key_hint_letter_padding">1dp</dimen> @@ -123,6 +115,9 @@ <dimen name="gesture_floating_preview_vertical_padding">16dp</dimen> <dimen name="gesture_floating_preview_round_radius">3dp</dimen> + <!-- Emoji keyboard --> + <fraction name="emoji_keyboard_key_width">14.2857%p</fraction> + <!-- Inset used in Accessibility mode to avoid accidental key presses when a finger slides off the screen. --> <dimen name="accessibility_edge_slop">8dp</dimen> diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 8983536af..52ebe161c 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -98,29 +98,17 @@ <string name="prefs_force_non_distinct_multitouch">Force non-distinct multitouch</string> <!-- Keyboard theme names --> - <string name="layout_basic">Basic</string> - <string name="layout_high_contrast">Basic (High Contrast)</string> - <string name="layout_stone_bold">Stone (bold)</string> - <string name="layout_stone_normal">Stone (normal)</string> <string name="layout_gingerbread">Gingerbread</string> <string name="layout_ics">IceCreamSandwich</string> <!-- For keyboard theme switcher dialog --> <string-array name="keyboard_layout_modes"> - <item>@string/layout_basic</item> - <item>@string/layout_high_contrast</item> - <item>@string/layout_stone_normal</item> - <item>@string/layout_stone_bold</item> - <item>@string/layout_gingerbread</item> <item>@string/layout_ics</item> + <item>@string/layout_gingerbread</item> </string-array> <string-array name="keyboard_layout_modes_values"> <item>0</item> <item>1</item> - <item>2</item> - <item>3</item> - <item>4</item> - <item>5</item> </string-array> <!-- Subtype locale display name exceptions. diff --git a/java/res/values/emoji-categories.xml b/java/res/values/emoji-categories.xml new file mode 100644 index 000000000..99d7b2389 --- /dev/null +++ b/java/res/values/emoji-categories.xml @@ -0,0 +1,83 @@ +<?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. +*/ +--> + +<!-- Note: This emoji code point list is valid prior to JB-MR2 (API < 18). + There is another emoji code point list for JB-MR2 and KLP and later under + res/xml/values-v1[89].--> +<resources> + <!-- Dummy codeArrays for recents emoji keyboard. + Do not remove these keys, because they are used as a template. --> + <array + name="emoji_recents" + format="string" + > + <item>52</item> + <item>45</item> + <item>43</item> + <item>45</item> + <item>4E</item> + <item>54</item> + </array> + <array + name="emoji_nature" + format="string" + > + </array> + <array + name="emoji_symbols" + format="string" + > + </array> + <array + name="emoji_faces" + format="string" + > + </array> + <array + name="emoji_objects" + format="string" + > + </array> + <array + name="emoji_places" + format="string" + > + </array> + <array + name="emoji_emoticons" + format="string" + > + <item>=-O</item> + <item>:-P</item> + <item>;-)</item> + <item>:-(</item> + <item>:-)</item> + <item>:-!</item> + <item>:-$</item> + <item>B-)</item> + <item>:O</item> + <item>:-*</item> + <item>:-D</item> + <item>:\'(</item> + <item>:-\\</item> + <item>O:-)</item> + <item>:-[</item> + </array> +</resources> diff --git a/java/res/values/keyboard-icons-black.xml b/java/res/values/keyboard-icons-black.xml deleted file mode 100644 index c1b1b6573..000000000 --- a/java/res/values/keyboard-icons-black.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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> - <style name="KeyboardIcons.Black"> - <!-- Keyboard icons --> - <!-- TODO: The following holo icon for phone (drawable-hdpi and drawable-xhdpi) are too - ambiguous. - sym_bkeyboard_voice_off - --> - <item name="iconShiftKey">@drawable/sym_bkeyboard_shift</item> - <item name="iconDeleteKey">@drawable/sym_bkeyboard_delete</item> - <item name="iconSettingsKey">@drawable/sym_bkeyboard_settings</item> - <item name="iconSpaceKey">@drawable/sym_bkeyboard_space</item> - <item name="iconEnterKey">@drawable/sym_bkeyboard_return</item> - <item name="iconSearchKey">@drawable/sym_bkeyboard_search</item> - <item name="iconTabKey">@drawable/sym_bkeyboard_tab</item> - <item name="iconShortcutKey">@drawable/sym_bkeyboard_mic</item> - <item name="iconShortcutForLabel">@drawable/sym_bkeyboard_label_mic</item> - <item name="iconSpaceKeyForNumberLayout">@drawable/sym_bkeyboard_space</item> - <item name="iconShiftKeyShifted">@drawable/sym_bkeyboard_shift_locked</item> - <item name="iconShortcutKeyDisabled">@drawable/sym_bkeyboard_voice_off</item> - <item name="iconTabKeyPreview">@drawable/sym_keyboard_feedback_tab</item> - <!-- TODO: Needs dedicated black theme globe icon --> - <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch</item> - <!-- TODO: Needs dedicated black theme ZWNJ and ZWJ icons --> - <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo</item> - <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo</item> - <item name="iconEmojiKey">@drawable/ic_emoji_light</item> - </style> -</resources> diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml deleted file mode 100644 index 5ada27ae8..000000000 --- a/java/res/values/keyboard-icons-ics.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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> - <style name="KeyboardIcons.IceCreamSandwich"> - <!-- 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</item> - <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo</item> - <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo</item> - <item name="iconSpaceKey">@null</item> - <item name="iconEnterKey">@drawable/sym_keyboard_return_holo</item> - <item name="iconSearchKey">@drawable/sym_keyboard_search_holo</item> - <item name="iconTabKey">@drawable/sym_keyboard_tab_holo</item> - <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo</item> - <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic_holo</item> - <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo</item> - <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_holo</item> - <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_holo</item> - <item name="iconTabKeyPreview">@drawable/sym_keyboard_feedback_tab</item> - <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch</item> - <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo</item> - <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo</item> - <item name="iconEmojiKey">@drawable/ic_emoji_light</item> - </style> -</resources> diff --git a/java/res/values/keyboard-icons-white.xml b/java/res/values/keyboard-icons-white.xml deleted file mode 100644 index 7c6de42fa..000000000 --- a/java/res/values/keyboard-icons-white.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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> - <style name="KeyboardIcons"> - <!-- Keyboard icons --> - <item name="iconShiftKey">@drawable/sym_keyboard_shift</item> - <item name="iconDeleteKey">@drawable/sym_keyboard_delete</item> - <item name="iconSettingsKey">@drawable/sym_keyboard_settings</item> - <item name="iconSpaceKey">@drawable/sym_keyboard_space</item> - <item name="iconEnterKey">@drawable/sym_keyboard_return</item>ZZ - <item name="iconSearchKey">@drawable/sym_keyboard_search</item> - <item name="iconTabKey">@drawable/sym_keyboard_tab</item> - <item name="iconShortcutKey">@drawable/sym_keyboard_mic</item> - <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic</item> - <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space</item> - <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked</item> - <!-- TODO: Needs non-holo disabled shortcut icon drawable --> - <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_holo</item> - <item name="iconTabKeyPreview">@drawable/sym_keyboard_feedback_tab</item> - <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch</item> - <!-- TODO: Needs dedicated black theme ZWNJ and ZWJ icons --> - <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo</item> - <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo</item> - <item name="iconEmojiKey">@drawable/ic_emoji_dark</item> - </style> -</resources> diff --git a/java/res/values/setup-styles.xml b/java/res/values/setup-styles.xml index 1ffe8ca46..c968b2fc6 100644 --- a/java/res/values/setup-styles.xml +++ b/java/res/values/setup-styles.xml @@ -1,17 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 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. +<!-- +/* +** +** 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"> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml deleted file mode 100644 index 37c6a9553..000000000 --- a/java/res/values/styles.xml +++ /dev/null @@ -1,415 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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"> - <!-- Theme "Basic" --> - <style name="Keyboard"> - <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> - <item name="themeId">0</item> - <item name="touchPositionCorrectionData">@array/touch_position_correction_data_default</item> - <item name="rowHeight">25%p</item> - <item name="moreKeysTemplate">@xml/kbd_more_keys_keyboard_template</item> - <item name="keyboardTopPadding">@fraction/keyboard_top_padding</item> - <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding</item> - <item name="keyboardLeftPadding">@fraction/keyboard_left_padding</item> - <item name="keyboardRightPadding">@fraction/keyboard_right_padding</item> - <item name="horizontalGap">@fraction/key_horizontal_gap</item> - <item name="verticalGap">@fraction/key_bottom_gap</item> - <item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item> - </style> - <style name="KeyboardView"> - <item name="android:background">@drawable/keyboard_background</item> - <item name="keyBackground">@drawable/btn_keyboard_key</item> - <item name="keyLetterSize">@fraction/key_letter_ratio</item> - <item name="keyLargeLetterRatio">@fraction/key_large_letter_ratio</item> - <item name="keyLabelSize">@fraction/key_label_ratio</item> - <item name="keyLargeLabelRatio">@fraction/key_large_label_ratio</item> - <item name="keyHintLetterRatio">@fraction/key_hint_letter_ratio</item> - <item name="keyHintLabelRatio">@fraction/key_hint_label_ratio</item> - <item name="keyShiftedLetterHintRatio">@fraction/key_uppercase_letter_ratio</item> - <item name="keyTypeface">normal</item> - <item name="keyTextColor">@color/key_text_color_default</item> - <item name="keyTextInactivatedColor">@color/key_text_color_default</item> - <item name="keyHintLetterColor">@color/key_hint_letter_color_default</item> - <item name="keyHintLabelColor">@color/key_hint_label_color_default</item> - <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_default</item> - <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_default</item> - <item name="keyLabelHorizontalPadding">@dimen/key_label_horizontal_padding</item> - <item name="keyHintLetterPadding">@dimen/key_hint_letter_padding</item> - <item name="keyPopupHintLetterPadding">@dimen/key_popup_hint_letter_padding</item> - <item name="keyShiftedLetterHintPadding">@dimen/key_uppercase_letter_padding</item> - <item name="keyPreviewTextColor">@color/key_text_color_default</item> - <item name="keyPreviewTextRatio">@fraction/key_preview_text_ratio</item> - <item name="verticalCorrection">@dimen/keyboard_vertical_correction</item> - <item name="keyTextShadowColor">@color/key_text_shadow_color_default</item> - <item name="keyTextShadowRadius">2.75</item> - <item name="backgroundDimAlpha">128</item> - <item name="gestureFloatingPreviewTextSize">@dimen/gesture_floating_preview_text_size</item> - <item name="gestureFloatingPreviewTextColor">@color/highlight_color_default</item> - <item name="gestureFloatingPreviewTextOffset">@dimen/gesture_floating_preview_text_offset</item> - <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_default</item> - <item name="gestureFloatingPreviewHorizontalPadding">@dimen/gesture_floating_preview_horizontal_padding</item> - <item name="gestureFloatingPreviewVerticalPadding">@dimen/gesture_floating_preview_vertical_padding</item> - <item name="gestureFloatingPreviewRoundRadius">@dimen/gesture_floating_preview_round_radius</item> - <item name="gestureTrailMinSamplingDistance">@dimen/gesture_trail_min_sampling_distance</item> - <item name="gestureTrailMaxInterpolationAngularThreshold">@integer/gesture_trail_max_interpolation_angular_threshold</item> - <item name="gestureTrailMaxInterpolationDistanceThreshold">@dimen/gesture_trail_max_interpolation_distance_threshold</item> - <item name="gestureTrailMaxInterpolationSegments">@integer/gesture_trail_max_interpolation_segments</item> - <item name="gestureTrailFadeoutStartDelay">@integer/config_gesture_trail_fadeout_start_delay</item> - <item name="gestureTrailFadeoutDuration">@integer/config_gesture_trail_fadeout_duration</item> - <item name="gestureTrailUpdateInterval">@integer/config_gesture_trail_update_interval</item> - <item name="gestureTrailColor">@color/highlight_color_default</item> - <item name="gestureTrailStartWidth">@dimen/gesture_trail_start_width</item> - <item name="gestureTrailEndWidth">@dimen/gesture_trail_end_width</item> - <item name="gestureTrailBodyRatio">@integer/gesture_trail_body_ratio</item> - <item name="gestureTrailShadowRatio">@integer/gesture_trail_shadow_ratio</item> - <!-- Common attributes of MainKeyboardView --> - <item name="keyHysteresisDistance">@dimen/config_key_hysteresis_distance</item> - <item name="keyHysteresisDistanceForSlidingModifier">@dimen/config_key_hysteresis_distance_for_sliding_modifier</item> - <item name="touchNoiseThresholdTime">@integer/config_touch_noise_threshold_time</item> - <item name="touchNoiseThresholdDistance">@dimen/config_touch_noise_threshold_distance</item> - <item name="slidingKeyInputEnable">@bool/config_sliding_key_input_enabled</item> - <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_default</item> - <item name="slidingKeyInputPreviewWidth">@dimen/config_sliding_key_input_preview_width</item> - <item name="slidingKeyInputPreviewBodyRatio">@integer/config_sliding_key_input_preview_body_ratio</item> - <item name="slidingKeyInputPreviewShadowRatio">@integer/config_sliding_key_input_preview_shadow_ratio</item> - <item name="keyRepeatStartTimeout">@integer/config_key_repeat_start_timeout</item> - <item name="keyRepeatInterval">@integer/config_key_repeat_interval</item> - <item name="longPressShiftLockTimeout">@integer/config_longpress_shift_lock_timeout</item> - <item name="ignoreAltCodeKeyTimeout">@integer/config_ignore_alt_code_key_timeout</item> - <item name="keyPreviewLayout">@layout/key_preview</item> - <item name="keyPreviewOffset">@dimen/key_preview_offset</item> - <item name="keyPreviewHeight">@dimen/key_preview_height</item> - <item name="keyPreviewLingerTimeout">@integer/config_key_preview_linger_timeout</item> - <item name="moreKeysKeyboardLayout">@layout/more_keys_keyboard</item> - <item name="showMoreKeysKeyboardAtTouchedPoint">@bool/config_show_more_keys_keyboard_at_touched_point</item> - <item name="languageOnSpacebarFinalAlpha">@integer/config_language_on_spacebar_final_alpha</item> - <item name="languageOnSpacebarFadeoutAnimator">@anim/language_on_spacebar_fadeout</item> - <!-- Remove animations for now because it could drain a non-negligible amount of battery while typing. - <item name="altCodeKeyWhileTypingFadeoutAnimator">@anim/alt_code_key_while_typing_fadeout</item> - <item name="altCodeKeyWhileTypingFadeinAnimator">@anim/alt_code_key_while_typing_fadein</item> - --> - <!-- Common attributes of MainKeyboardView for gesture typing detection and recognition --> - <item name="gestureFloatingPreviewTextLingerTimeout">@integer/config_gesture_floating_preview_text_linger_timeout</item> - <item name="gestureStaticTimeThresholdAfterFastTyping">@integer/config_gesture_static_time_threshold_after_fast_typing</item> - <item name="gestureDetectFastMoveSpeedThreshold">@fraction/config_gesture_detect_fast_move_speed_threshold</item> - <item name="gestureDynamicThresholdDecayDuration">@integer/config_gesture_dynamic_threshold_decay_duration</item> - <item name="gestureDynamicTimeThresholdFrom">@integer/config_gesture_dynamic_time_threshold_from</item> - <item name="gestureDynamicTimeThresholdTo">@integer/config_gesture_dynamic_time_threshold_to</item> - <item name="gestureDynamicDistanceThresholdFrom">@fraction/config_gesture_dynamic_distance_threshold_from</item> - <item name="gestureDynamicDistanceThresholdTo">@fraction/config_gesture_dynamic_distance_threshold_to</item> - <item name="gestureSamplingMinimumDistance">@fraction/config_gesture_sampling_minimum_distance</item> - <item name="gestureRecognitionMinimumTime">@integer/config_gesture_recognition_minimum_time</item> - <item name="gestureRecognitionUpdateTime">@integer/config_gesture_recognition_update_time</item> - <item name="gestureRecognitionSpeedThreshold">@fraction/config_gesture_recognition_speed_threshold</item> - <item name="suppressKeyPreviewAfterBatchInputDuration">@integer/config_suppress_key_preview_after_batch_input_duration</item> - </style> - <style - name="MainKeyboardView" - parent="KeyboardView"> - <item name="autoCorrectionSpacebarLedEnabled">true</item> - <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item> - <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item> - <item name="spacebarTextColor">@color/spacebar_text_color_default</item> - <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_default</item> - </style> - <style - name="MoreKeysKeyboard" - parent="Keyboard" - > - <item name="keyboardTopPadding">0%p</item> - <item name="keyboardBottomPadding">0%p</item> - <item name="horizontalGap">0%p</item> - <item name="touchPositionCorrectionData">@null</item> - </style> - <style - name="MoreKeysKeyboardView" - parent="KeyboardView" - > - <item name="keyBackground">@drawable/btn_keyboard_key_popup</item> - <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction</item> - </style> - <style name="MoreKeysKeyboardPanelStyle"> - <item name="android:background">@drawable/keyboard_popup_panel_background</item> - </style> - <style - name="SuggestionStripViewStyle" - > - <item name="android:background">@drawable/keyboard_suggest_strip</item> - <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item> - <item name="colorValidTypedWord">@color/highlight_color_default</item> - <item name="colorTypedWord">@color/typed_word_color_default</item> - <item name="colorAutoCorrect">@color/highlight_color_default</item> - <item name="colorSuggested">@color/highlight_color_default</item> - <item name="alphaObsoleted">50%</item> - <item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item> - <item name="centerSuggestionPercentile">@fraction/center_suggestion_percentile</item> - <item name="maxMoreSuggestionsRow">@integer/max_more_suggestions_row</item> - <item name="minMoreSuggestionsWidth">@fraction/min_more_suggestions_width</item> - </style> - <style - name="MoreSuggestionsViewStyle" - parent="MoreKeysKeyboardView" - > - </style> - <style name="SuggestionBackgroundStyle"> - <item name="android:background">@drawable/btn_suggestion</item> - </style> - <!-- Theme "Basic high contrast" --> - <style - name="Keyboard.HighContrast" - parent="Keyboard" - > - <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> - <item name="themeId">1</item> - </style> - <style - name="KeyboardView.HighContrast" - parent="KeyboardView" - > - <item name="android:background">@android:color/black</item> - <item name="keyBackground">@drawable/btn_keyboard_key3</item> - </style> - <style - name="MainKeyboardView.HighContrast" - parent="KeyboardView.HighContrast" - > - <item name="autoCorrectionSpacebarLedEnabled">true</item> - <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item> - <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item> - <item name="spacebarTextColor">@color/spacebar_text_color_default</item> - <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_default</item> - </style> - <!-- Theme "Stone" --> - <style - name="Keyboard.Stone" - parent="Keyboard" - > - <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> - <item name="themeId">6</item> - <item name="keyboardTopPadding">@fraction/keyboard_top_padding_stone</item> - <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding_stone</item> - <item name="horizontalGap">@fraction/key_horizontal_gap_stone</item> - <item name="verticalGap">@fraction/key_bottom_gap_stone</item> - </style> - <style - name="KeyboardView.Stone" - parent="KeyboardView" - > - <item name="keyBackground">@drawable/btn_keyboard_key_stone</item> - <item name="keyTextColor">@color/key_text_color_stone</item> - <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_stone</item> - <item name="keyHintLetterColor">@color/key_hint_letter_color_stone</item> - <item name="keyHintLabelColor">@color/key_hint_label_color_stone</item> - <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_stone</item> - <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_stone</item> - <item name="keyTextShadowColor">@color/key_text_shadow_color_stone</item> - </style> - <style - name="MainKeyboardView.Stone" - parent="KeyboardView.Stone" - > - <item name="autoCorrectionSpacebarLedEnabled">true</item> - <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item> - <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item> - <item name="spacebarTextColor">@color/spacebar_text_color_stone</item> - <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_stone</item> - </style> - <style - name="MoreKeysKeyboard.Stone" - parent="Keyboard.Stone" - > - <item name="keyboardTopPadding">0%p</item> - <item name="keyboardBottomPadding">0%p</item> - <item name="horizontalGap">0%p</item> - <item name="touchPositionCorrectionData">@null</item> - </style> - <style - name="MoreKeysKeyboardView.Stone" - parent="MoreKeysKeyboardView" - > - <item name="keyBackground">@drawable/btn_keyboard_key_stone</item> - <item name="keyTextColor">@color/key_text_color_stone</item> - <item name="keyTextShadowColor">@color/key_text_shadow_color_stone</item> - </style> - <!-- Theme "Stone bold" --> - <style - name="Keyboard.Stone.Bold" - parent="Keyboard.Stone" - > - <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> - <item name="themeId">7</item> - </style> - <style - name="KeyboardView.Stone.Bold" - parent="KeyboardView.Stone" - > - <item name="keyTypeface">bold</item> - </style> - <style - name="MainKeyboardView.Stone.Bold" - parent="KeyboardView.Stone.Bold" - > - <item name="autoCorrectionSpacebarLedEnabled">true</item> - <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item> - <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item> - <item name="spacebarTextColor">@color/spacebar_text_color_stone</item> - <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_stone</item> - </style> - <!-- Theme "Gingerbread" --> - <style - name="Keyboard.Gingerbread" - parent="Keyboard" - > - <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> - <item name="themeId">8</item> - <item name="touchPositionCorrectionData">@array/touch_position_correction_data_gingerbread</item> - <item name="horizontalGap">@fraction/key_horizontal_gap_gb</item> - <item name="verticalGap">@fraction/key_bottom_gap_gb</item> - </style> - <style - name="KeyboardView.Gingerbread" - parent="KeyboardView" - > - <item name="android:background">@drawable/keyboard_dark_background</item> - <item name="keyBackground">@drawable/btn_keyboard_key_gingerbread</item> - <item name="keyTypeface">bold</item> - </style> - <style - name="MainKeyboardView.Gingerbread" - parent="KeyboardView.Gingerbread" - > - <item name="autoCorrectionSpacebarLedEnabled">true</item> - <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item> - <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item> - <item name="spacebarTextColor">@color/spacebar_text_color_default</item> - <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_default</item> - </style> - <style - name="MoreKeysKeyboard.Gingerbread" - parent="Keyboard.Gingerbread" - > - <item name="keyboardTopPadding">0%p</item> - <item name="keyboardBottomPadding">0%p</item> - <item name="horizontalGap">0%p</item> - <item name="touchPositionCorrectionData">@null</item> - </style> - <style - name="MoreKeysKeyboardView.Gingerbread" - parent="MoreKeysKeyboardView" - > - <item name="android:background">@null</item> - </style> - <!-- Theme "IceCreamSandwich" --> - <style - name="Keyboard.IceCreamSandwich" - parent="Keyboard" - > - <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> - <item name="themeId">5</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_ice_cream_sandwich</item> - </style> - <style - name="KeyboardView.IceCreamSandwich" - parent="KeyboardView" - > - <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="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="keyPreviewLayout">@layout/key_preview_ics</item> - <item name="keyPreviewTextColor">@color/key_text_color_ics</item> - <item name="keyPreviewOffset">@dimen/key_preview_offset_ics</item> - <item name="keyTextShadowColor">@color/key_text_shadow_color_ics</item> - <item name="keyTextShadowRadius">0.0</item> - <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_ics</item> - <item name="gestureFloatingPreviewTextColor">@color/highlight_color_ics</item> - <item name="gestureTrailColor">@color/highlight_color_ics</item> - </style> - <style - name="MainKeyboardView.IceCreamSandwich" - parent="KeyboardView.IceCreamSandwich" - > - <item name="autoCorrectionSpacebarLedEnabled">false</item> - <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item> - <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item> - <item name="spacebarTextColor">@color/spacebar_text_color_ics</item> - <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_ics</item> - </style> - <style - name="MoreKeysKeyboard.IceCreamSandwich" - parent="Keyboard.IceCreamSandwich" - > - <item name="keyboardTopPadding">0%p</item> - <item name="keyboardBottomPadding">0%p</item> - <item name="horizontalGap">0%p</item> - <item name="touchPositionCorrectionData">@null</item> - </style> - <style - name="MoreKeysKeyboardView.IceCreamSandwich" - parent="MoreKeysKeyboardView" - > - <item name="android:background">@null</item> - <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item> - <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_ics</item> - </style> - <style name="MoreKeysKeyboardPanelStyle.IceCreamSandwich"> - <item name="android:background">@drawable/keyboard_popup_panel_background_holo</item> - </style> - <style - name="SuggestionStripViewStyle.IceCreamSandwich" - > - <item name="android:background">@drawable/keyboard_suggest_strip_holo</item> - <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item> - <item name="colorValidTypedWord">@color/highlight_color_ics</item> - <item name="colorTypedWord">@color/highlight_color_ics</item> - <item name="colorAutoCorrect">@color/highlight_color_ics</item> - <item name="colorSuggested">@color/highlight_color_ics</item> - <item name="alphaValidTypedWord">85%</item> - <item name="alphaTypedWord">85%</item> - <item name="alphaSuggested">70%</item> - <item name="alphaObsoleted">70%</item> - <item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item> - <item name="centerSuggestionPercentile">@fraction/center_suggestion_percentile</item> - <item name="maxMoreSuggestionsRow">@integer/max_more_suggestions_row</item> - <item name="minMoreSuggestionsWidth">@fraction/min_more_suggestions_width</item> - </style> - <style - name="MoreSuggestionsViewStyle.IceCreamSandwich" - parent="MoreKeysKeyboardView.IceCreamSandwich" - > - </style> - <style name="SuggestionBackgroundStyle.IceCreamSandwich"> - <item name="android:background">@drawable/btn_suggestion_ics</item> - </style> - <style - name="SuggestionPreviewBackgroundStyle.IceCreamSandwich" - parent="MoreKeysKeyboardPanelStyle.IceCreamSandwich" - > - </style> - <style name="MoreKeysKeyboardAnimation"> - <item name="android:windowEnterAnimation">@anim/more_keys_keyboard_fadein</item> - <item name="android:windowExitAnimation">@anim/more_keys_keyboard_fadeout</item> - </style> -</resources> diff --git a/java/res/values/themes-basic-highcontrast.xml b/java/res/values/themes-basic-highcontrast.xml deleted file mode 100644 index e81d47386..000000000 --- a/java/res/values/themes-basic-highcontrast.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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> - <style name="KeyboardTheme.HighContrast" parent="KeyboardIcons"> - <item name="keyboardStyle">@style/Keyboard.HighContrast</item> - <item name="keyboardViewStyle">@style/KeyboardView.HighContrast</item> - <item name="mainKeyboardViewStyle">@style/MainKeyboardView.HighContrast</item> - <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard</item> - <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView</item> - <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item> - <item name="suggestionStripViewStyle">@style/SuggestionStripViewStyle</item> - <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item> - <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> - </style> -</resources> diff --git a/java/res/values/themes-basic.xml b/java/res/values/themes-basic.xml deleted file mode 100644 index c44f0f614..000000000 --- a/java/res/values/themes-basic.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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> - <style name="KeyboardTheme" parent="KeyboardIcons"> - <item name="keyboardStyle">@style/Keyboard</item> - <item name="keyboardViewStyle">@style/KeyboardView</item> - <item name="mainKeyboardViewStyle">@style/MainKeyboardView</item> - <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard</item> - <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView</item> - <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item> - <item name="suggestionStripViewStyle">@style/SuggestionStripViewStyle</item> - <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item> - <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> - </style> -</resources> diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml new file mode 100644 index 000000000..c9334ce5f --- /dev/null +++ b/java/res/values/themes-common.xml @@ -0,0 +1,114 @@ +<?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" /> + <!-- Default theme values --> + <style name="Keyboard"> + <item name="touchPositionCorrectionData">@array/touch_position_correction_data_default</item> + <item name="rowHeight">25%p</item> + <item name="moreKeysTemplate">@xml/kbd_more_keys_keyboard_template</item> + <item name="keyboardLeftPadding">@fraction/keyboard_left_padding</item> + <item name="keyboardRightPadding">@fraction/keyboard_right_padding</item> + <item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item> + </style> + <style name="KeyboardView"> + <item name="keyLetterSize">@fraction/key_letter_ratio</item> + <item name="keyLargeLetterRatio">@fraction/key_large_letter_ratio</item> + <item name="keyLabelSize">@fraction/key_label_ratio</item> + <item name="keyLargeLabelRatio">@fraction/key_large_label_ratio</item> + <item name="keyHintLetterRatio">@fraction/key_hint_letter_ratio</item> + <item name="keyHintLabelRatio">@fraction/key_hint_label_ratio</item> + <item name="keyShiftedLetterHintRatio">@fraction/key_uppercase_letter_ratio</item> + <item name="keyTypeface">normal</item> + <item name="keyLabelHorizontalPadding">@dimen/key_label_horizontal_padding</item> + <item name="keyHintLetterPadding">@dimen/key_hint_letter_padding</item> + <item name="keyPopupHintLetterPadding">@dimen/key_popup_hint_letter_padding</item> + <item name="keyShiftedLetterHintPadding">@dimen/key_uppercase_letter_padding</item> + <item name="keyPreviewTextRatio">@fraction/key_preview_text_ratio</item> + <item name="verticalCorrection">@dimen/keyboard_vertical_correction</item> + <item name="backgroundDimAlpha">128</item> + <item name="gestureFloatingPreviewTextSize">@dimen/gesture_floating_preview_text_size</item> + <item name="gestureFloatingPreviewTextOffset">@dimen/gesture_floating_preview_text_offset</item> + <item name="gestureFloatingPreviewHorizontalPadding">@dimen/gesture_floating_preview_horizontal_padding</item> + <item name="gestureFloatingPreviewVerticalPadding">@dimen/gesture_floating_preview_vertical_padding</item> + <item name="gestureFloatingPreviewRoundRadius">@dimen/gesture_floating_preview_round_radius</item> + <item name="gestureTrailMinSamplingDistance">@dimen/gesture_trail_min_sampling_distance</item> + <item name="gestureTrailMaxInterpolationAngularThreshold">@integer/gesture_trail_max_interpolation_angular_threshold</item> + <item name="gestureTrailMaxInterpolationDistanceThreshold">@dimen/gesture_trail_max_interpolation_distance_threshold</item> + <item name="gestureTrailMaxInterpolationSegments">@integer/gesture_trail_max_interpolation_segments</item> + <item name="gestureTrailFadeoutStartDelay">@integer/config_gesture_trail_fadeout_start_delay</item> + <item name="gestureTrailFadeoutDuration">@integer/config_gesture_trail_fadeout_duration</item> + <item name="gestureTrailUpdateInterval">@integer/config_gesture_trail_update_interval</item> + <item name="gestureTrailStartWidth">@dimen/gesture_trail_start_width</item> + <item name="gestureTrailEndWidth">@dimen/gesture_trail_end_width</item> + <item name="gestureTrailBodyRatio">@integer/gesture_trail_body_ratio</item> + <item name="gestureTrailShadowRatio">@integer/gesture_trail_shadow_ratio</item> + <!-- Common attributes of MainKeyboardView --> + <item name="keyHysteresisDistance">@dimen/config_key_hysteresis_distance</item> + <item name="keyHysteresisDistanceForSlidingModifier">@dimen/config_key_hysteresis_distance_for_sliding_modifier</item> + <item name="touchNoiseThresholdTime">@integer/config_touch_noise_threshold_time</item> + <item name="touchNoiseThresholdDistance">@dimen/config_touch_noise_threshold_distance</item> + <item name="slidingKeyInputEnable">@bool/config_sliding_key_input_enabled</item> + <item name="slidingKeyInputPreviewWidth">@dimen/config_sliding_key_input_preview_width</item> + <item name="slidingKeyInputPreviewBodyRatio">@integer/config_sliding_key_input_preview_body_ratio</item> + <item name="slidingKeyInputPreviewShadowRatio">@integer/config_sliding_key_input_preview_shadow_ratio</item> + <item name="keyRepeatStartTimeout">@integer/config_key_repeat_start_timeout</item> + <item name="keyRepeatInterval">@integer/config_key_repeat_interval</item> + <item name="longPressShiftLockTimeout">@integer/config_longpress_shift_lock_timeout</item> + <item name="ignoreAltCodeKeyTimeout">@integer/config_ignore_alt_code_key_timeout</item> + <item name="keyPreviewHeight">@dimen/key_preview_height</item> + <item name="keyPreviewLingerTimeout">@integer/config_key_preview_linger_timeout</item> + <item name="moreKeysKeyboardLayout">@layout/more_keys_keyboard</item> + <item name="showMoreKeysKeyboardAtTouchedPoint">@bool/config_show_more_keys_keyboard_at_touched_point</item> + <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item> + <item name="languageOnSpacebarFinalAlpha">@integer/config_language_on_spacebar_final_alpha</item> + <item name="languageOnSpacebarFadeoutAnimator">@anim/language_on_spacebar_fadeout</item> + <!-- Remove animations for now because it could drain a non-negligible amount of battery while typing. + <item name="altCodeKeyWhileTypingFadeoutAnimator">@anim/alt_code_key_while_typing_fadeout</item> + <item name="altCodeKeyWhileTypingFadeinAnimator">@anim/alt_code_key_while_typing_fadein</item> + --> + <!-- Common attributes of MainKeyboardView for gesture typing detection and recognition --> + <item name="gestureFloatingPreviewTextLingerTimeout">@integer/config_gesture_floating_preview_text_linger_timeout</item> + <item name="gestureStaticTimeThresholdAfterFastTyping">@integer/config_gesture_static_time_threshold_after_fast_typing</item> + <item name="gestureDetectFastMoveSpeedThreshold">@fraction/config_gesture_detect_fast_move_speed_threshold</item> + <item name="gestureDynamicThresholdDecayDuration">@integer/config_gesture_dynamic_threshold_decay_duration</item> + <item name="gestureDynamicTimeThresholdFrom">@integer/config_gesture_dynamic_time_threshold_from</item> + <item name="gestureDynamicTimeThresholdTo">@integer/config_gesture_dynamic_time_threshold_to</item> + <item name="gestureDynamicDistanceThresholdFrom">@fraction/config_gesture_dynamic_distance_threshold_from</item> + <item name="gestureDynamicDistanceThresholdTo">@fraction/config_gesture_dynamic_distance_threshold_to</item> + <item name="gestureSamplingMinimumDistance">@fraction/config_gesture_sampling_minimum_distance</item> + <item name="gestureRecognitionMinimumTime">@integer/config_gesture_recognition_minimum_time</item> + <item name="gestureRecognitionUpdateTime">@integer/config_gesture_recognition_update_time</item> + <item name="gestureRecognitionSpeedThreshold">@fraction/config_gesture_recognition_speed_threshold</item> + <item name="suppressKeyPreviewAfterBatchInputDuration">@integer/config_suppress_key_preview_after_batch_input_duration</item> + </style> + <style name="MainKeyboardView" /> + <style name="MoreKeysKeyboard" /> + <style name="MoreKeysKeyboardView" /> + <style + name="SuggestionStripView" + > + <item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item> + <item name="centerSuggestionPercentile">@fraction/center_suggestion_percentile</item> + <item name="maxMoreSuggestionsRow">@integer/max_more_suggestions_row</item> + <item name="minMoreSuggestionsWidth">@fraction/min_more_suggestions_width</item> + </style> +</resources> diff --git a/java/res/values/themes-gb.xml b/java/res/values/themes-gb.xml new file mode 100644 index 000000000..b430eeafd --- /dev/null +++ b/java/res/values/themes-gb.xml @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2011, 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> + <style name="KeyboardTheme.GB" parent="KeyboardIcons.GB"> + <item name="keyboardStyle">@style/Keyboard.GB</item> + <item name="keyboardViewStyle">@style/KeyboardView.GB</item> + <item name="mainKeyboardViewStyle">@style/MainKeyboardView.GB</item> + <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.GB</item> + <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.GB</item> + <item name="suggestionStripViewStyle">@style/SuggestionStripView.GB</item> + <item name="moreKeysKeyboardBackground">@drawable/keyboard_popup_panel_background_gb</item> + <item name="suggestionStripBackground">@drawable/keyboard_suggest_strip_gb</item> + <item name="suggestionBackground">@drawable/btn_suggestion_gb</item> + </style> + <style name="KeyboardIcons.GB"> + <!-- Keyboard icons --> + <item name="iconShiftKey">@drawable/sym_keyboard_shift</item> + <item name="iconDeleteKey">@drawable/sym_keyboard_delete</item> + <item name="iconSettingsKey">@drawable/sym_keyboard_settings</item> + <item name="iconSpaceKey">@drawable/sym_keyboard_space</item> + <item name="iconEnterKey">@drawable/sym_keyboard_return</item> + <item name="iconSearchKey">@drawable/sym_keyboard_search</item> + <item name="iconTabKey">@drawable/sym_keyboard_tab</item> + <item name="iconShortcutKey">@drawable/sym_keyboard_mic</item> + <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic</item> + <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space</item> + <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked</item> + <!-- TODO: Needs non-holo disabled shortcut icon drawable --> + <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_holo</item> + <item name="iconTabKeyPreview">@drawable/sym_keyboard_feedback_tab</item> + <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch</item> + <!-- TODO: Needs dedicated black theme ZWNJ and ZWJ icons --> + <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo</item> + <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo</item> + <item name="iconEmojiKey">@drawable/ic_emoji_dark</item> + </style> + <style + name="Keyboard.GB" + parent="Keyboard" + > + <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> + <item name="themeId">1</item> + <item name="touchPositionCorrectionData">@array/touch_position_correction_data_gb</item> + <item name="keyboardTopPadding">@fraction/keyboard_top_padding_gb</item> + <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding_gb</item> + <item name="horizontalGap">@fraction/key_horizontal_gap_gb</item> + <item name="verticalGap">@fraction/key_bottom_gap_gb</item> + </style> + <style + name="KeyboardView.GB" + parent="KeyboardView" + > + <item name="android:background">@drawable/keyboard_background_gb</item> + <item name="keyBackground">@drawable/btn_keyboard_key_gb</item> + <item name="keyTypeface">bold</item> + <item name="keyTextColor">@color/key_text_color_gb</item> + <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_gb</item> + <item name="keyHintLetterColor">@color/key_hint_letter_color_gb</item> + <item name="keyHintLabelColor">@color/key_hint_label_color_gb</item> + <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_gb</item> + <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_gb</item> + <item name="keyPreviewTextColor">@color/key_text_color_gb</item> + <item name="keyTextShadowColor">@color/key_text_shadow_color_gb</item> + <item name="keyTextShadowRadius">2.75</item> + </style> + <style + name="MainKeyboardView.GB" + parent="KeyboardView.GB" + > + <item name="keyPreviewLayout">@layout/key_preview_gb</item> + <item name="keyPreviewOffset">@dimen/key_preview_offset_gb</item> + <item name="gestureFloatingPreviewTextColor">@color/highlight_color_gb</item> + <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_gb</item> + <item name="gestureTrailColor">@color/highlight_color_gb</item> + <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_gb</item> + <item name="autoCorrectionSpacebarLedEnabled">true</item> + <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_gb</item> + <item name="spacebarTextColor">@color/spacebar_text_color_gb</item> + <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_gb</item> + </style> + <style + name="MoreKeysKeyboard.GB" + parent="Keyboard.GB" + > + <item name="keyboardTopPadding">0%p</item> + <item name="keyboardBottomPadding">0%p</item> + <item name="horizontalGap">0%p</item> + <item name="touchPositionCorrectionData">@null</item> + </style> + <style + name="MoreKeysKeyboardView.GB" + parent="KeyboardView.GB" + > + <item name="android:background">@null</item> + <item name="keyBackground">@drawable/btn_keyboard_key_popup_gb</item> + <item name="keyTypeface">normal</item> + <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_gb</item> + </style> + <style + name="SuggestionStripView.GB" + parent="SuggestionStripView" + > + <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item> + <item name="colorValidTypedWord">@color/highlight_color_gb</item> + <item name="colorTypedWord">@color/typed_word_color_gb</item> + <item name="colorAutoCorrect">@color/highlight_color_gb</item> + <item name="colorSuggested">@color/highlight_color_gb</item> + <item name="alphaObsoleted">50%</item> + </style> +</resources> diff --git a/java/res/values/themes-gingerbread.xml b/java/res/values/themes-gingerbread.xml deleted file mode 100644 index 129afdf5b..000000000 --- a/java/res/values/themes-gingerbread.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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> - <style name="KeyboardTheme.Gingerbread" parent="KeyboardIcons"> - <item name="keyboardStyle">@style/Keyboard.Gingerbread</item> - <item name="keyboardViewStyle">@style/KeyboardView.Gingerbread</item> - <item name="mainKeyboardViewStyle">@style/MainKeyboardView.Gingerbread</item> - <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.Gingerbread</item> - <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.Gingerbread</item> - <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item> - <item name="suggestionStripViewStyle">@style/SuggestionStripViewStyle</item> - <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item> - <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> - </style> -</resources> diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml index 1264831f3..5ca0665ad 100644 --- a/java/res/values/themes-ics.xml +++ b/java/res/values/themes-ics.xml @@ -1,29 +1,133 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. +<!-- +/* +** +** Copyright 2011, 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> - <style name="KeyboardTheme.IceCreamSandwich" parent="KeyboardIcons.IceCreamSandwich"> - <item name="keyboardStyle">@style/Keyboard.IceCreamSandwich</item> - <item name="keyboardViewStyle">@style/KeyboardView.IceCreamSandwich</item> - <item name="mainKeyboardViewStyle">@style/MainKeyboardView.IceCreamSandwich</item> - <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.IceCreamSandwich</item> - <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.IceCreamSandwich</item> - <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle.IceCreamSandwich</item> - <item name="suggestionStripViewStyle">@style/SuggestionStripViewStyle.IceCreamSandwich</item> - <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle.IceCreamSandwich</item> - <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle.IceCreamSandwich</item> + <style name="KeyboardTheme.ICS" parent="KeyboardIcons.ICS"> + <item name="keyboardStyle">@style/Keyboard.ICS</item> + <item name="keyboardViewStyle">@style/KeyboardView.ICS</item> + <item name="mainKeyboardViewStyle">@style/MainKeyboardView.ICS</item> + <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.ICS</item> + <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.ICS</item> + <item name="suggestionStripViewStyle">@style/SuggestionStripView.ICS</item> + <item name="moreKeysKeyboardBackground">@drawable/keyboard_popup_panel_background_holo</item> + <item name="suggestionStripBackground">@drawable/keyboard_suggest_strip_holo</item> + <item name="suggestionBackground">@drawable/btn_suggestion_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</item> + <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo</item> + <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo</item> + <item name="iconSpaceKey">@null</item> + <item name="iconEnterKey">@drawable/sym_keyboard_return_holo</item> + <item name="iconSearchKey">@drawable/sym_keyboard_search_holo</item> + <item name="iconTabKey">@drawable/sym_keyboard_tab_holo</item> + <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo</item> + <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic_holo</item> + <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo</item> + <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_holo</item> + <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_holo</item> + <item name="iconTabKeyPreview">@drawable/sym_keyboard_feedback_tab</item> + <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch</item> + <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo</item> + <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo</item> + <item name="iconEmojiKey">@drawable/ic_emoji_light</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> + </style> + <style + name="KeyboardView.ICS" + parent="KeyboardView" + > + <item name="android:background">@drawable/keyboard_background_ics</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="keyTextShadowRadius">0.0</item> + </style> + <style + name="MainKeyboardView.ICS" + parent="KeyboardView.ICS" + > + <item name="keyPreviewLayout">@layout/key_preview_ics</item> + <item name="keyPreviewOffset">@dimen/key_preview_offset_ics</item> + <item name="gestureFloatingPreviewTextColor">@color/highlight_color_ics</item> + <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_ics</item> + <item name="gestureTrailColor">@color/highlight_color_ics</item> + <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_ics</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> + </style> + <style + name="MoreKeysKeyboard.ICS" + parent="Keyboard.ICS" + > + <item name="keyboardTopPadding">0%p</item> + <item name="keyboardBottomPadding">0%p</item> + <item name="horizontalGap">0%p</item> + <item name="touchPositionCorrectionData">@null</item> + </style> + <style + name="MoreKeysKeyboardView.ICS" + parent="KeyboardView.ICS" + > + <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> + </style> + <style + name="SuggestionStripView.ICS" + parent="SuggestionStripView" + > + <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item> + <item name="colorValidTypedWord">@color/typed_word_color_ics</item> + <item name="colorTypedWord">@color/typed_word_color_ics</item> + <item name="colorAutoCorrect">@color/highlight_color_ics</item> + <item name="colorSuggested">@color/suggested_word_color_ics</item> + <item name="alphaObsoleted">70%</item> + </style> + <style name="MoreKeysKeyboardAnimation"> + <item name="android:windowEnterAnimation">@anim/more_keys_keyboard_fadein</item> + <item name="android:windowExitAnimation">@anim/more_keys_keyboard_fadeout</item> </style> </resources> diff --git a/java/res/values/themes-stone-bold.xml b/java/res/values/themes-stone-bold.xml deleted file mode 100644 index 196f3ef9f..000000000 --- a/java/res/values/themes-stone-bold.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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> - <style name="KeyboardTheme.Stone.Bold" parent="KeyboardIcons.Black"> - <item name="keyboardStyle">@style/Keyboard.Stone.Bold</item> - <item name="keyboardViewStyle">@style/KeyboardView.Stone.Bold</item> - <item name="mainKeyboardViewStyle">@style/MainKeyboardView.Stone.Bold</item> - <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.Stone</item> - <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.Stone</item> - <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item> - <item name="suggestionStripViewStyle">@style/SuggestionStripViewStyle</item> - <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item> - <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> - </style> -</resources> diff --git a/java/res/values/themes-stone.xml b/java/res/values/themes-stone.xml deleted file mode 100644 index d0d35c28d..000000000 --- a/java/res/values/themes-stone.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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> - <style name="KeyboardTheme.Stone" parent="KeyboardIcons.Black"> - <item name="keyboardStyle">@style/Keyboard.Stone</item> - <item name="keyboardViewStyle">@style/KeyboardView.Stone</item> - <item name="mainKeyboardViewStyle">@style/MainKeyboardView.Stone</item> - <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.Stone</item> - <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.Stone</item> - <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item> - <item name="suggestionStripViewStyle">@style/SuggestionStripViewStyle</item> - <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item> - <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> - </style> -</resources> diff --git a/java/res/values/touch-position-correction.xml b/java/res/values/touch-position-correction.xml index 7df86f467..9df517b32 100644 --- a/java/res/values/touch-position-correction.xml +++ b/java/res/values/touch-position-correction.xml @@ -37,7 +37,7 @@ </string-array> <string-array - name="touch_position_correction_data_gingerbread" + name="touch_position_correction_data_gb" translatable="false" > <!-- First row --> @@ -57,7 +57,7 @@ </string-array> <string-array - name="touch_position_correction_data_ice_cream_sandwich" + name="touch_position_correction_data_ics" translatable="false" > <!-- First row --> diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml index f407ba346..fc9342b91 100644 --- a/java/res/xml-sw600dp/key_styles_common.xml +++ b/java/res/xml-sw600dp/key_styles_common.xml @@ -178,16 +178,6 @@ latin:keyLabel="!text/label_to_alpha_key" latin:parentStyle="baseForLayoutSwitchKeyStyle" /> <key-style - latin:styleName="toMoreSymbolKeyStyle" - latin:code="!code/key_shift" - latin:keyLabel="!text/label_to_more_symbol_for_tablet_key" - latin:parentStyle="baseForLayoutSwitchKeyStyle" /> - <key-style - latin:styleName="backFromMoreSymbolKeyStyle" - latin:code="!code/key_shift" - latin:keyLabel="!text/label_to_symbol_key" - latin:parentStyle="baseForLayoutSwitchKeyStyle" /> - <key-style latin:styleName="comKeyStyle" latin:keyLabel="!text/keylabel_for_popular_domain" latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase" diff --git a/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml index 0a27ca70c..324e025ed 100644 --- a/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml +++ b/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml @@ -23,36 +23,32 @@ > <switch> <case - latin:keyboardLayoutSetElement="symbols|symbolsShifted" + latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" > <Key latin:keyLabel="[" - latin:moreKeys="{" /> - <Key - latin:keyLabel="]" - latin:moreKeys="}" /> - <!-- U+00A6: "¦" BROKEN BAR --> - <Key - latin:keyLabel="\\" - latin:moreKeys="\\|,¦" /> - </case> - <default> - <Key - latin:keyLabel="[" latin:keyHintLabel="{" - latin:moreKeys="{" + latin:additionalMoreKeys="{" latin:keyStyle="hasShiftedLetterHintStyle" /> <Key latin:keyLabel="]" latin:keyHintLabel="}" - latin:moreKeys="}" + latin:additionalMoreKeys="}" latin:keyStyle="hasShiftedLetterHintStyle" /> - <!-- U+00A6: "¦" BROKEN BAR --> <Key latin:keyLabel="\\" latin:keyHintLabel="|" - latin:moreKeys="\\|,¦" + latin:additionalMoreKeys="\\|" latin:keyStyle="hasShiftedLetterHintStyle" /> + </case> + <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> + <default> + <Key + latin:keyLabel="{" /> + <Key + latin:keyLabel="}" /> + <Key + latin:keyLabel="|" /> </default> </switch> -</merge> +</merge>
\ No newline at end of file diff --git a/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml b/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml index 0e3013afe..254b5e571 100644 --- a/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml +++ b/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml @@ -23,26 +23,27 @@ > <switch> <case - latin:keyboardLayoutSetElement="symbols|symbolsShifted" + latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" > <Key latin:keyLabel=";" - latin:moreKeys=":" /> + latin:keyHintLabel=":" + latin:additionalMoreKeys=":" + latin:keyStyle="hasShiftedLetterHintStyle" /> <Key latin:keyLabel="\'" - latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" /> + latin:keyHintLabel=""" + latin:additionalMoreKeys=""" + latin:keyStyle="hasShiftedLetterHintStyle" + latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,%,!text/single_quotes" /> </case> + <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> <default> <Key - latin:keyLabel=";" - latin:keyHintLabel=":" - latin:moreKeys=":" - latin:keyStyle="hasShiftedLetterHintStyle" /> + latin:keyLabel=":" /> <Key - latin:keyLabel="\'" - latin:keyHintLabel=""" - latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,",!text/single_quotes" - latin:keyStyle="hasShiftedLetterHintStyle" /> + latin:keyLabel=""" + latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" /> </default> </switch> </merge> diff --git a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml index ee5271abe..774ff8d05 100644 --- a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml +++ b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml @@ -23,28 +23,26 @@ > <switch> <case - latin:keyboardLayoutSetElement="symbols|symbolsShifted" + latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" > - <!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK - U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK - U+2264: "≤" LESS-THAN OR EQUAL TO - U+2265: "≥" GREATER-THAN EQUAL TO - U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK - U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK --> - <Key + <Key latin:keyLabel="," + latin:keyHintLabel="<" latin:additionalMoreKeys="<" - latin:moreKeys="!fixedColumnOrder!4,‹,⁤,«" /> + latin:keyStyle="hasShiftedLetterHintStyle" /> <Key latin:keyLabel="." + latin:keyHintLabel=">" latin:additionalMoreKeys=">" - latin:moreKeys="!fixedColumnOrder!4,›,⁥,»" /> - <!-- U+00BF: "¿" INVERTED QUESTION MARK --> + latin:keyStyle="hasShiftedLetterHintStyle" /> <Key latin:keyLabel="/" + latin:keyHintLabel="\?" latin:additionalMoreKeys="\?" - latin:moreKeys="¿" /> + latin:keyStyle="hasShiftedLetterHintStyle" + latin:moreKeys="!text/more_keys_for_symbols_question" /> </case> + <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> <default> <!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK @@ -53,24 +51,14 @@ U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK --> <Key - latin:keyLabel="," - latin:keyHintLabel="<" - latin:additionalMoreKeys="<" - latin:moreKeys="!fixedColumnOrder!4,‹,≤,«" - latin:keyStyle="hasShiftedLetterHintStyle" /> + latin:keyLabel="<" + latin:moreKeys="!fixedColumnOrder!3,‹,≤,«" /> <Key - latin:keyLabel="." - latin:keyHintLabel=">" - latin:additionalMoreKeys=">" - latin:moreKeys="!fixedColumnOrder!4,›,≥,»" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <!-- U+00BF: "¿" INVERTED QUESTION MARK --> + latin:keyLabel=">" + latin:moreKeys="!fixedColumnOrder!3,›,≥,»" /> <Key - latin:keyLabel="/" - latin:keyHintLabel="\?" - latin:additionalMoreKeys="\?" - latin:moreKeys="¿" - latin:keyStyle="hasShiftedLetterHintStyle" /> + latin:keyLabel="\?" + latin:moreKeys="!text/more_keys_for_symbols_question" /> </default> </switch> </merge> diff --git a/java/res/xml-sw600dp/row_pcqwerty5.xml b/java/res/xml-sw600dp/row_pcqwerty5.xml index 3c4a46660..a79d2a87f 100644 --- a/java/res/xml-sw600dp/row_pcqwerty5.xml +++ b/java/res/xml-sw600dp/row_pcqwerty5.xml @@ -38,9 +38,23 @@ latin:keyStyle="spaceKeyStyle" latin:keyXPos="25.5%p" latin:keyWidth="49.0%p" /> - <include - latin:keyXPos="-9.0%p" - latin:keyWidth="fillRight" - latin:keyboardLayout="@xml/key_shortcut" /> + <switch> + <case + latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" + > + <include + latin:keyXPos="-9.0%p" + latin:keyWidth="9.0%p" + latin:keyboardLayout="@xml/key_shortcut" /> + </case> + <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> + <default> + <include + latin:keyXPos="-9.0%p" + latin:keyWidth="9.0%p" + latin:backgroundType="functional" + latin:keyboardLayout="@xml/key_symbols_period" /> + </default> + </switch> </Row> </merge> diff --git a/java/res/xml-sw600dp/row_symbols4.xml b/java/res/xml-sw600dp/row_symbols4.xml index f138d8ef4..26ce1ebf4 100644 --- a/java/res/xml-sw600dp/row_symbols4.xml +++ b/java/res/xml-sw600dp/row_symbols4.xml @@ -28,21 +28,13 @@ <Key latin:keyStyle="toAlphaKeyStyle" latin:keyWidth="10.0%p" /> - <Key - latin:keyLabel="/" /> - <include - latin:keyboardLayout="@xml/key_f1" /> <include latin:keyXPos="28.0%p" latin:keyboardLayout="@xml/key_space" latin:backgroundType="normal" /> - <Key - latin:keyLabel=""" - latin:moreKeys="!text/more_keys_for_tablet_double_quote" /> - <Key - latin:keyLabel="_" /> - <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> - <Spacer - latin:keyWidth="fillRight" /> + <Spacer /> + <Spacer /> + <include + latin:keyboardLayout="@xml/key_f2" /> </Row> </merge> diff --git a/java/res/xml-sw600dp/row_symbols_shift4.xml b/java/res/xml-sw600dp/row_symbols_shift4.xml deleted file mode 100644 index 29befa92a..000000000 --- a/java/res/xml-sw600dp/row_symbols_shift4.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <Row - latin:keyWidth="9.0%p" - latin:backgroundType="functional" - > - <Key - latin:keyStyle="toAlphaKeyStyle" - latin:keyWidth="10.0%p" /> - <!-- Here is empty space. --> - <include - latin:keyXPos="28.0%p" - latin:keyboardLayout="@xml/key_space" - latin:backgroundType="normal" /> - <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> - <Spacer - latin:keyWidth="fillRight" /> - </Row> -</merge> diff --git a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml index b11bbba1b..254d3fdba 100644 --- a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml +++ b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml @@ -21,93 +21,87 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <switch> - <case - latin:keyboardLayoutSetElement="symbols|symbolsShifted" - > - <include - latin:keyboardLayout="@xml/keys_pcqwerty_symbols1" /> - </case> - <!-- keyboardLayoutSetElement="alphabet*" --> - <default> - <!-- U+00AC: "¬" NOT SIGN --> - <Key - latin:keyLabel="`" - latin:keyHintLabel="~" - latin:additionalMoreKeys="~" - latin:moreKeys="¬" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <!-- U+00A1: "¡" NVERTED EXCLAMATION MARK --> - <Key - latin:keyLabel="1" - latin:keyHintLabel="!" - latin:additionalMoreKeys="!" - latin:moreKeys="¡,!text/more_keys_for_symbols_1" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <Key - latin:keyLabel="2" - latin:keyHintLabel="\@" - latin:additionalMoreKeys="\@" - latin:moreKeys="!text/more_keys_for_symbols_2" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <Key - latin:keyLabel="3" - latin:keyHintLabel="\#" - latin:additionalMoreKeys="\#" - latin:moreKeys="!text/more_keys_for_symbols_3" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <Key - latin:keyLabel="4" - latin:keyHintLabel="$" - latin:additionalMoreKeys="$" - latin:moreKeys="!text/more_keys_for_symbols_4" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <Key - latin:keyLabel="5" - latin:keyHintLabel="%" - latin:additionalMoreKeys="\\%" - latin:moreKeys="!text/more_keys_for_symbols_5" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <Key - latin:keyLabel="6" - latin:keyHintLabel="^" - latin:additionalMoreKeys="^" - latin:moreKeys="!text/more_keys_for_symbols_6" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <Key - latin:keyLabel="7" - latin:keyHintLabel="&" - latin:additionalMoreKeys="&" - latin:moreKeys="!text/more_keys_for_symbols_7" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <Key - latin:keyLabel="8" - latin:keyHintLabel="*" - latin:additionalMoreKeys="*" - latin:moreKeys="!text/more_keys_for_symbols_8" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <Key - latin:keyLabel="9" - latin:keyHintLabel="(" - latin:additionalMoreKeys="(" - latin:moreKeys="!text/more_keys_for_symbols_9" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <Key - latin:keyLabel="0" - latin:keyHintLabel=")" - latin:additionalMoreKeys=")" - latin:moreKeys="!text/more_keys_for_symbols_0" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <Key - latin:keyLabel="-" - latin:keyHintLabel="_" - latin:moreKeys="_" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <Key - latin:keyLabel="=" - latin:keyHintLabel="+" - latin:moreKeys="+" - latin:keyStyle="hasShiftedLetterHintStyle" /> - </default> - </switch> + <Key + latin:keyLabel="`" + latin:keyHintLabel="~" + latin:additionalMoreKeys="~" + latin:keyStyle="hasShiftedLetterHintStyle" /> + <Key + latin:keyLabel="1" + latin:keyHintLabel="!" + latin:additionalMoreKeys="!" + latin:keyStyle="hasShiftedLetterHintStyle" + latin:moreKeys="!text/more_keys_for_symbols_exclamation,!text/more_keys_for_symbols_1" /> + <Key + latin:keyLabel="2" + latin:keyHintLabel="\@" + latin:additionalMoreKeys="\@" + latin:keyStyle="hasShiftedLetterHintStyle" + latin:moreKeys="!text/more_keys_for_symbols_2" /> + <Key + latin:keyLabel="3" + latin:keyHintLabel="\#" + latin:additionalMoreKeys="\#" + latin:keyStyle="hasShiftedLetterHintStyle" + latin:moreKeys="!text/more_keys_for_symbols_3" /> + <Key + latin:keyLabel="4" + latin:keyHintLabel="$" + latin:additionalMoreKeys="$" + latin:keyStyle="hasShiftedLetterHintStyle" + latin:moreKeys="!text/more_keys_for_symbols_4" /> + <Key + latin:keyLabel="5" + latin:keyHintLabel="%" + latin:additionalMoreKeys="\\%" + latin:keyStyle="hasShiftedLetterHintStyle" + latin:moreKeys="!text/more_keys_for_symbols_5" /> + <Key + latin:keyLabel="6" + latin:keyHintLabel="^" + latin:additionalMoreKeys="^" + latin:keyStyle="hasShiftedLetterHintStyle" + latin:moreKeys="!text/more_keys_for_symbols_6" /> + <Key + latin:keyLabel="7" + latin:keyHintLabel="&" + latin:additionalMoreKeys="&" + latin:keyStyle="hasShiftedLetterHintStyle" + latin:moreKeys="!text/more_keys_for_symbols_7" /> + <Key + latin:keyLabel="8" + latin:keyHintLabel="*" + latin:additionalMoreKeys="*" + latin:keyStyle="hasShiftedLetterHintStyle" + latin:moreKeys="!text/more_keys_for_symbols_8" /> + <Key + latin:keyLabel="9" + latin:keyHintLabel="(" + latin:additionalMoreKeys="(" + latin:keyStyle="hasShiftedLetterHintStyle" + latin:moreKeys="!text/more_keys_for_symbols_9" /> + <Key + latin:keyLabel="0" + latin:keyHintLabel=")" + latin:additionalMoreKeys=")" + latin:keyStyle="hasShiftedLetterHintStyle" + latin:moreKeys="!text/more_keys_for_symbols_0" /> + <!-- U+2013: "–" EN DASH + U+2014: "—" EM DASH + U+00B7: "·" MIDDLE DOT --> + <Key + latin:keyLabel="-" + latin:keyHintLabel="_" + latin:additionalMoreKeys="_" + latin:keyStyle="hasShiftedLetterHintStyle" + latin:moreKeys="–,—,·" /> + <!-- U+221E: "∞" INFINITY + U+2260: "≠" NOT EQUAL TO + U+2248: "≈" ALMOST EQUAL TO --> + <Key + latin:keyLabel="=" + latin:keyHintLabel="+" + latin:additionalMoreKeys="+" + latin:keyStyle="hasShiftedLetterHintStyle" + latin:moreKeys="∞,≠,≈" /> </merge> diff --git a/java/res/xml-sw600dp/rowkeys_symbols2.xml b/java/res/xml-sw600dp/rowkeys_symbols2.xml deleted file mode 100644 index 14abb42f9..000000000 --- a/java/res/xml-sw600dp/rowkeys_symbols2.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <switch> - <case - latin:languageCode="fa" - > - <!-- U+066C: "٬" ARABIC THOUSANDS SEPARATOR --> - <Key - latin:keyLabel="٬" - latin:keyHintLabel="&" - latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint" - latin:moreKeys="&" /> - </case> - <default> - <Key - latin:keyLabel="\#" /> - </default> - </switch> - <Key - latin:keyStyle="currencyKeyStyle" /> - <Key - latin:keyLabel="!text/keylabel_for_symbols_percent" - latin:moreKeys="!text/more_keys_for_symbols_percent" /> - <switch> - <case - latin:languageCode="fa" - > - <!-- U+066B: "٫" ARABIC DECIMAL SEPARATOR --> - <Key - latin:keyLabel="٫" - latin:keyHintLabel="\#" - latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint" - latin:moreKeys="\#" /> - </case> - <default> - <Key - latin:keyLabel="&" /> - </default> - </switch> - <Key - latin:keyLabel="*" - latin:moreKeys="!text/more_keys_for_star" /> - <!-- U+2013: "–" EN DASH - U+2014: "—" EM DASH - U+00B7: "·" MIDDLE DOT --> - <Key - latin:keyLabel="-" - latin:moreKeys="_,–,—,·" /> - <Key - latin:keyLabel="+" - latin:moreKeys="!text/more_keys_for_plus" /> - <include - latin:keyboardLayout="@xml/keys_parentheses" /> -</merge> diff --git a/java/res/xml-sw600dp/rowkeys_symbols3.xml b/java/res/xml-sw600dp/rowkeys_symbols3.xml deleted file mode 100644 index 30fba3812..000000000 --- a/java/res/xml-sw600dp/rowkeys_symbols3.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/keys_less_greater" /> - <!-- U+2260: "≠" NOT EQUAL TO - U+2248: "≈" ALMOST EQUAL TO --> - <Key - latin:keyLabel="=" - latin:moreKeys="≠,≈" /> - <switch> - <case - latin:mode="url" - > - <Key - latin:keyLabel="\'" /> - </case> - <default> - <Key - latin:keyLabel=":" /> - </default> - </switch> - <Key - latin:keyLabel="!text/keylabel_for_symbols_semicolon" - latin:moreKeys="!text/more_keys_for_symbols_semicolon" /> - <Key - latin:keyLabel="!text/keylabel_for_comma" - latin:moreKeys="!text/more_keys_for_comma" /> - <Key - latin:keyLabel="." /> - <Key - latin:keyLabel="!" - latin:moreKeys="!text/more_keys_for_symbols_exclamation" /> - <Key - latin:keyLabel="!text/keylabel_for_symbols_question" - latin:moreKeys="!text/more_keys_for_symbols_question" /> -</merge> diff --git a/java/res/xml-sw600dp/rowkeys_symbols_shift1.xml b/java/res/xml-sw600dp/rowkeys_symbols_shift1.xml deleted file mode 100644 index 3549fdda4..000000000 --- a/java/res/xml-sw600dp/rowkeys_symbols_shift1.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <Key - latin:keyLabel="~" /> - <Key - latin:keyLabel="`" /> - <Key - latin:keyLabel="|" /> - <!-- U+2022: "•" BULLET --> - <Key - latin:keyLabel="•" - latin:moreKeys="!text/more_keys_for_bullet" /> - <!-- U+221A: "√" SQUARE ROOT --> - <Key - latin:keyLabel="√" /> - <!-- U+03C0: "π" GREEK SMALL LETTER PI - U+03A0: "Π" GREEK CAPITAL LETTER PI --> - <Key - latin:keyLabel="π" - latin:moreKeys="Π" /> - <!-- U+00F7: "÷" DIVISION SIGN --> - <Key - latin:keyLabel="÷" /> - <!-- U+00D7: "×" MULTIPLICATION SIGN --> - <Key - latin:keyLabel="×" /> - <!-- U+00A7: "§" SECTION SIGN - U+00B6: "¶" PILCROW SIGN --> - <Key - latin:keyLabel="§" - latin:moreKeys="¶" /> - <!-- U+0394: "Δ" GREEK CAPITAL LETTER DELTA --> - <Key - latin:keyLabel="Δ" /> -</merge> diff --git a/java/res/xml-sw600dp/rowkeys_symbols_shift2.xml b/java/res/xml-sw600dp/rowkeys_symbols_shift2.xml deleted file mode 100644 index 2048b7335..000000000 --- a/java/res/xml-sw600dp/rowkeys_symbols_shift2.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <Key - latin:keyStyle="moreCurrency1KeyStyle" /> - <Key - latin:keyStyle="moreCurrency2KeyStyle" /> - <Key - latin:keyStyle="moreCurrency3KeyStyle" /> - <Key - latin:keyStyle="moreCurrency4KeyStyle" /> - <!-- U+2191: "↑" UPWARDS ARROW - U+2193: "↓" DOWNWARDS ARROW - U+2190: "←" LEFTWARDS ARROW - U+2192: "→" RIGHTWARDS ARROW --> - <Key - latin:keyLabel="^" - latin:moreKeys="↑,↓,←,→" /> - <!-- U+00B0: "°" DEGREE SIGN - U+2032: "′" PRIME - U+2033: "″" DOUBLE PRIME --> - <Key - latin:keyLabel="°" - latin:moreKeys="′,″" /> - <!-- U+00B1: "±" PLUS-MINUS SIGN - U+221E: "∞" INFINITY --> - <Key - latin:keyLabel="±" - latin:moreKeys="∞" /> - <include - latin:keyboardLayout="@xml/keys_curly_brackets" /> -</merge> diff --git a/java/res/xml-sw600dp/rowkeys_symbols_shift3.xml b/java/res/xml-sw600dp/rowkeys_symbols_shift3.xml deleted file mode 100644 index 8bd865639..000000000 --- a/java/res/xml-sw600dp/rowkeys_symbols_shift3.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <Key - latin:keyLabel="\\" /> - <!-- U+00A9: "©" COPYRIGHT SIGN --> - <Key - latin:keyLabel="©" /> - <!-- U+00AE: "®" REGISTERED SIGN --> - <Key - latin:keyLabel="®" /> - <!-- U+2122: "™" TRADE MARK SIGN --> - <Key - latin:keyLabel="™" /> - <!-- U+2105: "℅" CARE OF --> - <Key - latin:keyLabel="℅" /> - <include - latin:keyboardLayout="@xml/keys_square_brackets" /> - <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK --> - <Key - latin:keyLabel="¡" /> - <!-- U+00BF: "¿" INVERTED QUESTION MARK --> - <Key - latin:keyLabel="¿" /> -</merge> diff --git a/java/res/xml-sw600dp/rows_10_10_7_symbols.xml b/java/res/xml-sw600dp/rows_10_10_7_symbols.xml deleted file mode 100644 index 0e4710c37..000000000 --- a/java/res/xml-sw600dp/rows_10_10_7_symbols.xml +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> - <Row - latin:keyWidth="9.0%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_symbols1" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="9.0%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_symbols2" /> - <Key - latin:keyStyle="enterKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="9.0%p" - > - <Key - latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyWidth="10.0%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_symbols3" /> - <Key - latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <include - latin:keyboardLayout="@xml/row_symbols4" /> -</merge> diff --git a/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml b/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml deleted file mode 100644 index 3d3b59f22..000000000 --- a/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> - <Row - latin:keyWidth="9.0%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift1" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="9.0%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift2" /> - <Key - latin:keyStyle="enterKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="9.0%p" - > - <Key - latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyWidth="10.0%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift3" /> - <Key - latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <include - latin:keyboardLayout="@xml/row_symbols_shift4" /> -</merge> diff --git a/java/res/xml-sw600dp/rows_pcqwerty.xml b/java/res/xml-sw600dp/rows_pcqwerty.xml index fa6080a19..8714815ef 100644 --- a/java/res/xml-sw600dp/rows_pcqwerty.xml +++ b/java/res/xml-sw600dp/rows_pcqwerty.xml @@ -26,8 +26,19 @@ <Row latin:keyWidth="7.0%p" > - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> + <switch> + <case + latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" + > + <include + latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> + </case> + <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> + <default> + <include + latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" /> + </default> + </switch> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> @@ -44,9 +55,7 @@ <Row latin:keyWidth="7.0%p" > - <Key - latin:keyStyle="toSymbolKeyStyle" - latin:keyLabel="!text/label_to_symbol_key_pcqwerty" + <Spacer latin:keyWidth="12.0%p" /> <include latin:keyboardLayout="@xml/rowkeys_pcqwerty3" /> diff --git a/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml b/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml deleted file mode 100644 index 5e1aa6382..000000000 --- a/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> - <Row - latin:keyWidth="7.0%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="7.0%p" - > - <Key - latin:keyStyle="tabKeyStyle" - latin:keyWidth="9.0%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty2" /> - </Row> - <Row - latin:keyWidth="7.0%p" - > - <Key - latin:keyStyle="toAlphaKeyStyle" - latin:keyWidth="12.0%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty3" /> - <Key - latin:keyStyle="enterKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="7.0%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty4" - latin:keyXPos="15.0%p" /> - </Row> - <include - latin:keyboardLayout="@xml/row_pcqwerty5" /> -</merge> diff --git a/java/res/xml-sw600dp/rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml index 3d0593dab..dee79e64f 100644 --- a/java/res/xml-sw600dp/rows_symbols.xml +++ b/java/res/xml-sw600dp/rows_symbols.xml @@ -23,8 +23,6 @@ > <include latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> <Row latin:keyWidth="9.0%p" > @@ -38,23 +36,22 @@ latin:keyWidth="9.0%p" > <include - latin:keyboardLayout="@xml/rowkeys_symbols2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_symbols2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillRight" /> </Row> - <Row + <Row latin:keyWidth="9.0%p" > - <Key - latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyWidth="10.0%p" /> <include + latin:keyXPos="1.0%p" latin:keyboardLayout="@xml/rowkeys_symbols3" /> <Key - latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyWidth="fillRight" /> + latin:keyLabel="," /> + <include + latin:keyboardLayout="@xml/key_symbols_period" + latin:backgroundType="normal" /> </Row> <include latin:keyboardLayout="@xml/row_symbols4" /> diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml deleted file mode 100644 index 0050c0c15..000000000 --- a/java/res/xml-sw600dp/rows_symbols_shift.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2011, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> - <Row - latin:keyWidth="9.0%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift1" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="9.0%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift2" - latin:keyXPos="4.5%p" /> - <Key - latin:keyStyle="enterKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="9.0%p" - > - <Key - latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyWidth="10.0%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift3" /> - <Key - latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <include - latin:keyboardLayout="@xml/row_symbols_shift4" /> -</merge> diff --git a/java/res/xml-sw600dp/kbd_10_10_7_symbols.xml b/java/res/xml-sw768dp/kbd_10_10_7_symbols.xml index dd545b5ef..dd545b5ef 100644 --- a/java/res/xml-sw600dp/kbd_10_10_7_symbols.xml +++ b/java/res/xml-sw768dp/kbd_10_10_7_symbols.xml diff --git a/java/res/xml-sw768dp/kbd_thai_symbols_shift.xml b/java/res/xml-sw768dp/kbd_thai_symbols_shift.xml deleted file mode 100644 index 135222b22..000000000 --- a/java/res/xml-sw768dp/kbd_thai_symbols_shift.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:rowHeight="20%p" - latin:verticalGap="@fraction/key_bottom_gap_5row" - latin:keyLetterSize="@fraction/key_letter_ratio_5row" - latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" - latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" -> - <include - latin:keyboardLayout="@xml/rows_thai_symbols_shift" /> -</Keyboard> diff --git a/java/res/xml-sw768dp/key_styles_common.xml b/java/res/xml-sw768dp/key_styles_common.xml index 7c0a82a71..538930948 100644 --- a/java/res/xml-sw768dp/key_styles_common.xml +++ b/java/res/xml-sw768dp/key_styles_common.xml @@ -168,16 +168,6 @@ latin:keyLabel="!text/label_to_alpha_key" latin:parentStyle="baseForLayoutSwitchKeyStyle" /> <key-style - latin:styleName="toMoreSymbolKeyStyle" - latin:code="!code/key_shift" - latin:keyLabel="!text/label_to_more_symbol_for_tablet_key" - latin:parentStyle="baseForLayoutSwitchKeyStyle" /> - <key-style - latin:styleName="backFromMoreSymbolKeyStyle" - latin:code="!code/key_shift" - latin:keyLabel="!text/label_to_symbol_key" - latin:parentStyle="baseForLayoutSwitchKeyStyle" /> - <key-style latin:styleName="comKeyStyle" latin:keyLabel="!text/keylabel_for_popular_domain" latin:keyLabelFlags="fontNormal|hasPopupHint|preserveCase" diff --git a/java/res/xml-sw768dp/row_pcqwerty5.xml b/java/res/xml-sw768dp/row_pcqwerty5.xml index e27ec878b..6bfd6463a 100644 --- a/java/res/xml-sw768dp/row_pcqwerty5.xml +++ b/java/res/xml-sw768dp/row_pcqwerty5.xml @@ -24,36 +24,34 @@ <Row latin:keyWidth="8.047%p" > - <include - latin:keyboardLayout="@xml/key_settings" /> <switch> <case - latin:keyboardLayoutSetElement="symbols|symbolsShifted" + latin:languageSwitchKeyEnabled="true" > - <Spacer - latin:keyXPos="15.0%p" - latin:keyWidth="10.5%p" /> + <Key + latin:keyStyle="languageSwitchKeyStyle" + latin:backgroundType="functional" /> </case> + </switch> + <Key + latin:keyStyle="spaceKeyStyle" + latin:keyXPos="25.5%p" + latin:keyWidth="49.0%p" /> + <switch> <case - latin:mode="email|url" + latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" > - <Key - latin:keyStyle="comKeyStyle" - latin:keyXPos="15.0%p" - latin:keyWidth="10.5%p" /> + <include + latin:keyXPos="-8.047%p" + latin:keyboardLayout="@xml/key_shortcut" /> </case> + <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> <default> - <Spacer - latin:keyXPos="15.0%p" - latin:keyWidth="10.5%p" /> + <include + latin:keyXPos="-8.047%p" + latin:backgroundType="functional" + latin:keyboardLayout="@xml/key_symbols_period" /> </default> </switch> - <Key - latin:keyStyle="spaceKeyStyle" - latin:keyWidth="49.0%p" /> - <include - latin:keyXPos="-8.047%p" - latin:keyWidth="fillRight" - latin:keyboardLayout="@xml/key_shortcut" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/row_symbols4.xml b/java/res/xml-sw768dp/row_symbols4.xml index b801a12a7..49340b8ae 100644 --- a/java/res/xml-sw768dp/row_symbols4.xml +++ b/java/res/xml-sw768dp/row_symbols4.xml @@ -28,21 +28,13 @@ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> <Spacer latin:keyWidth="13.829%p" /> - <Key - latin:keyLabel="/" /> - <include - latin:keyboardLayout="@xml/key_f1" /> <include latin:keyXPos="29.923%p" latin:keyboardLayout="@xml/key_space" latin:backgroundType="normal" /> - <Key - latin:keyLabel=""" - latin:moreKeys="!text/more_keys_for_tablet_double_quote" /> - <Key - latin:keyLabel="_" /> - <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> - <Spacer - latin:keyWidth="fillRight" /> + <Spacer /> + <Spacer /> + <include + latin:keyboardLayout="@xml/key_f2" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/row_symbols_shift4.xml b/java/res/xml-sw768dp/row_symbols_shift4.xml deleted file mode 100644 index f71864bc3..000000000 --- a/java/res/xml-sw768dp/row_symbols_shift4.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <Row - latin:keyWidth="8.047%p" - latin:backgroundType="functional" - > - <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> - <Spacer - latin:keyWidth="29.923%p" /> - <include - latin:keyboardLayout="@xml/key_space" - latin:backgroundType="normal" /> - <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> - <Spacer - latin:keyWidth="fillRight" /> - </Row> -</merge> diff --git a/java/res/xml-sw768dp/rows_10_10_7_symbols.xml b/java/res/xml-sw768dp/rows_10_10_7_symbols.xml index d9b0d2383..967b90359 100644 --- a/java/res/xml-sw768dp/rows_10_10_7_symbols.xml +++ b/java/res/xml-sw768dp/rows_10_10_7_symbols.xml @@ -23,8 +23,6 @@ > <include latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> <Row latin:keyWidth="8.282%p" > @@ -54,15 +52,14 @@ <Row latin:keyWidth="8.047%p" > - <Key - latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyWidth="13.829%p" /> <include + latin:keyXPos="5.782%p" latin:keyboardLayout="@xml/rowkeys_symbols3" /> <Key - latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyXPos="-13.750%p" - latin:keyWidth="fillRight" /> + latin:keyLabel="," /> + <include + latin:keyboardLayout="@xml/key_symbols_period" + latin:backgroundType="normal" /> </Row> <include latin:keyboardLayout="@xml/row_symbols4" /> diff --git a/java/res/xml-sw768dp/rows_10_10_7_symbols_shift.xml b/java/res/xml-sw768dp/rows_10_10_7_symbols_shift.xml deleted file mode 100644 index a317dbf84..000000000 --- a/java/res/xml-sw768dp/rows_10_10_7_symbols_shift.xml +++ /dev/null @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> - <Row - latin:keyWidth="8.282%p" - > - <Key - latin:keyStyle="tabKeyStyle" - latin:keyLabelFlags="alignLeft" - latin:keyWidth="7.969%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift1" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="8.125%p" - > - <Key - latin:keyStyle="toAlphaKeyStyle" - latin:keyLabelFlags="alignLeft" - latin:keyWidth="10.167%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift2" /> - <Key - latin:keyStyle="enterKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="8.047%p" - > - <Key - latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyWidth="13.829%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift3" /> - <Key - latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyXPos="-13.750%p" - latin:keyWidth="fillRight" /> - </Row> - <include - latin:keyboardLayout="@xml/row_symbols_shift4" /> -</merge> diff --git a/java/res/xml-sw768dp/rows_pcqwerty.xml b/java/res/xml-sw768dp/rows_pcqwerty.xml index a8447288f..5f721a224 100644 --- a/java/res/xml-sw768dp/rows_pcqwerty.xml +++ b/java/res/xml-sw768dp/rows_pcqwerty.xml @@ -26,8 +26,19 @@ <Row latin:keyWidth="7.0%p" > - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> + <switch> + <case + latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" + > + <include + latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> + </case> + <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> + <default> + <include + latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" /> + </default> + </switch> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> @@ -44,9 +55,7 @@ <Row latin:keyWidth="7.0%p" > - <Key - latin:keyStyle="toSymbolKeyStyle" - latin:keyLabel="!text/label_to_symbol_key_pcqwerty" + <Spacer latin:keyWidth="12.0%p" /> <include latin:keyboardLayout="@xml/rowkeys_pcqwerty3" /> diff --git a/java/res/xml-sw768dp/rows_pcqwerty_symbols.xml b/java/res/xml-sw768dp/rows_pcqwerty_symbols.xml deleted file mode 100644 index 956da97fb..000000000 --- a/java/res/xml-sw768dp/rows_pcqwerty_symbols.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2011, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> - <Row - latin:keyWidth="7.0%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="7.0%p" - > - <Key - latin:keyStyle="tabKeyStyle" - latin:keyWidth="9.0%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty2" /> - </Row> - <Row - latin:keyWidth="7.0%p" - > - <Key - latin:keyStyle="toAlphaKeyStyle" - latin:keyWidth="12.0%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty3" /> - <Key - latin:keyStyle="enterKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="7.0%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty4" - latin:keyXPos="15.0%p" /> - </Row> - <include - latin:keyboardLayout="@xml/row_pcqwerty5" /> -</merge> diff --git a/java/res/xml-sw768dp/rows_symbols.xml b/java/res/xml-sw768dp/rows_symbols.xml index efd77352b..57944cb8e 100644 --- a/java/res/xml-sw768dp/rows_symbols.xml +++ b/java/res/xml-sw768dp/rows_symbols.xml @@ -23,8 +23,6 @@ > <include latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> <Row latin:keyWidth="8.282%p" > @@ -54,14 +52,14 @@ <Row latin:keyWidth="8.047%p" > - <Key - latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyWidth="13.829%p" /> <include + latin:keyXPos="5.782%p" latin:keyboardLayout="@xml/rowkeys_symbols3" /> <Key - latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyWidth="fillRight" /> + latin:keyLabel="," /> + <include + latin:keyboardLayout="@xml/key_symbols_period" + latin:backgroundType="normal" /> </Row> <include latin:keyboardLayout="@xml/row_symbols4" /> diff --git a/java/res/xml-sw768dp/rows_symbols_shift.xml b/java/res/xml-sw768dp/rows_symbols_shift.xml deleted file mode 100644 index fd1b93d51..000000000 --- a/java/res/xml-sw768dp/rows_symbols_shift.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2011, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> - <Row - latin:keyWidth="8.282%p" - > - <Key - latin:keyStyle="tabKeyStyle" - latin:keyLabelFlags="alignLeft" - latin:keyWidth="7.969%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift1" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="8.125%p" - > - <Key - latin:keyStyle="toAlphaKeyStyle" - latin:keyLabelFlags="alignLeft" - latin:keyWidth="11.172%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift2" /> - <Key - latin:keyStyle="enterKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="8.047%p" - > - <Key - latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyWidth="13.829%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift3" /> - <Key - latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <include - latin:keyboardLayout="@xml/row_symbols_shift4" /> -</merge> diff --git a/java/res/xml-sw768dp/rows_thai_symbols.xml b/java/res/xml-sw768dp/rows_thai_symbols.xml index 528514182..15fb4e177 100644 --- a/java/res/xml-sw768dp/rows_thai_symbols.xml +++ b/java/res/xml-sw768dp/rows_thai_symbols.xml @@ -23,8 +23,6 @@ > <include latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> <Row latin:keyWidth="8.282%p" > @@ -61,15 +59,14 @@ <Row latin:keyWidth="8.047%p" > - <Key - latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyWidth="13.829%p" /> <include + latin:keyXPos="5.782%p" latin:keyboardLayout="@xml/rowkeys_symbols3" /> <Key - latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyXPos="-13.750%p" - latin:keyWidth="fillRight" /> + latin:keyLabel="," /> + <include + latin:keyboardLayout="@xml/key_symbols_period" + latin:backgroundType="normal" /> </Row> <include latin:keyboardLayout="@xml/row_symbols4" /> diff --git a/java/res/xml-sw768dp/rows_thai_symbols_shift.xml b/java/res/xml-sw768dp/rows_thai_symbols_shift.xml deleted file mode 100644 index 9d2694b86..000000000 --- a/java/res/xml-sw768dp/rows_thai_symbols_shift.xml +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> - <Row - latin:keyWidth="8.282%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_thai_digits" - latin:keyXPos="7.969%p" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="8.282%p" - > - <Key - latin:keyStyle="tabKeyStyle" - latin:keyLabelFlags="alignLeft" - latin:keyWidth="7.969%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift1" /> - </Row> - <Row - latin:keyWidth="8.125%p" - > - <Key - latin:keyStyle="toAlphaKeyStyle" - latin:keyLabelFlags="alignLeft" - latin:keyWidth="11.172%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift2" /> - <Key - latin:keyStyle="enterKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="8.047%p" - > - <Key - latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyWidth="13.829%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift3" /> - <Key - latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyXPos="-13.750%p" - latin:keyWidth="fillRight" /> - </Row> - <include - latin:keyboardLayout="@xml/row_symbols_shift4" /> -</merge> diff --git a/java/res/xml/kbd_thai_symbols_shift.xml b/java/res/xml/kbd_emoji_category1.xml index a2d67caf4..92b0c3fbf 100644 --- a/java/res/xml/kbd_thai_symbols_shift.xml +++ b/java/res/xml/kbd_emoji_category1.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2012, The Android Open Source Project +** 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. @@ -20,8 +20,11 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" + latin:keyWidth="@fraction/emoji_keyboard_key_width" + latin:keyLetterSize="90%p" > - <include - latin:keyboardLayout="@xml/rows_symbols_shift" /> + <GridRows + latin:codesArray="@array/emoji_faces" + latin:keyLabelFlags="fontNormal" + latin:backgroundType="empty" /> </Keyboard> diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_emoji_category2.xml index 932ec017e..17d36c52f 100644 --- a/java/res/xml/kbd_symbols_shift.xml +++ b/java/res/xml/kbd_emoji_category2.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2008, The Android Open Source Project +** 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. @@ -20,8 +20,11 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" + latin:keyWidth="@fraction/emoji_keyboard_key_width" + latin:keyLetterSize="90%p" > - <include - latin:keyboardLayout="@xml/rows_symbols_shift" /> + <GridRows + latin:codesArray="@array/emoji_objects" + latin:keyLabelFlags="fontNormal" + latin:backgroundType="empty" /> </Keyboard> diff --git a/java/res/xml-sw600dp/kbd_10_10_7_symbols_shift.xml b/java/res/xml/kbd_emoji_category3.xml index c36f0097e..9000a3a11 100644 --- a/java/res/xml-sw600dp/kbd_10_10_7_symbols_shift.xml +++ b/java/res/xml/kbd_emoji_category3.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2012, The Android Open Source Project +** 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. @@ -20,8 +20,11 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" + latin:keyWidth="@fraction/emoji_keyboard_key_width" + latin:keyLetterSize="90%p" > - <include - latin:keyboardLayout="@xml/rows_10_10_7_symbols_shift" /> + <GridRows + latin:codesArray="@array/emoji_nature" + latin:keyLabelFlags="fontNormal" + latin:backgroundType="empty" /> </Keyboard> diff --git a/java/res/xml/kbd_10_10_7_symbols_shift.xml b/java/res/xml/kbd_emoji_category4.xml index a2d67caf4..e79e124e7 100644 --- a/java/res/xml/kbd_10_10_7_symbols_shift.xml +++ b/java/res/xml/kbd_emoji_category4.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2012, The Android Open Source Project +** 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. @@ -20,8 +20,11 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" + latin:keyWidth="@fraction/emoji_keyboard_key_width" + latin:keyLetterSize="90%p" > - <include - latin:keyboardLayout="@xml/rows_symbols_shift" /> + <GridRows + latin:codesArray="@array/emoji_places" + latin:keyLabelFlags="fontNormal" + latin:backgroundType="empty" /> </Keyboard> diff --git a/java/res/xml/kbd_emoji_category5.xml b/java/res/xml/kbd_emoji_category5.xml new file mode 100644 index 000000000..07b3d908c --- /dev/null +++ b/java/res/xml/kbd_emoji_category5.xml @@ -0,0 +1,30 @@ +<?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. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:keyWidth="@fraction/emoji_keyboard_key_width" + latin:keyLetterSize="90%p" +> + <GridRows + latin:codesArray="@array/emoji_symbols" + latin:keyLabelFlags="fontNormal" + latin:backgroundType="empty" /> +</Keyboard> diff --git a/java/res/xml/kbd_emoji_category6.xml b/java/res/xml/kbd_emoji_category6.xml new file mode 100644 index 000000000..a07966b07 --- /dev/null +++ b/java/res/xml/kbd_emoji_category6.xml @@ -0,0 +1,30 @@ +<?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. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:keyWidth="@fraction/emoji_keyboard_key_width" + latin:keyLetterSize="90%p" +> + <GridRows + latin:textsArray="@array/emoji_emoticons" + latin:keyLabelFlags="fontNormal" + latin:backgroundType="empty" /> +</Keyboard> diff --git a/java/res/xml/kbd_emoji_recents.xml b/java/res/xml/kbd_emoji_recents.xml new file mode 100644 index 000000000..8b4fa958c --- /dev/null +++ b/java/res/xml/kbd_emoji_recents.xml @@ -0,0 +1,30 @@ +<?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. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:keyWidth="@fraction/emoji_keyboard_key_width" + latin:keyLetterSize="90%p" +> + <GridRows + latin:codesArray="@array/emoji_recents" + latin:keyLabelFlags="fontNormal" + latin:backgroundType="empty" /> +</Keyboard> diff --git a/java/res/xml/kbd_pcqwerty_symbols.xml b/java/res/xml/kbd_pcqwerty_symbols.xml deleted file mode 100644 index bfb39e8aa..000000000 --- a/java/res/xml/kbd_pcqwerty_symbols.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:rowHeight="20%p" - latin:verticalGap="@fraction/key_bottom_gap_5row" - latin:keyLetterSize="@fraction/key_letter_ratio_5row" - latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" - latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" -> - <include - latin:keyboardLayout="@xml/rows_pcqwerty_symbols" /> -</Keyboard> diff --git a/java/res/xml/key_styles_currency.xml b/java/res/xml/key_currency.xml index 76fe0e6b0..2e4f828ce 100644 --- a/java/res/xml/key_styles_currency.xml +++ b/java/res/xml/key_currency.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2011, The Android Open Source Project +** 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. @@ -18,6 +18,7 @@ */ --> +<!-- TODO: Move these definitions to text resources and remove key_currency.xml. --> <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > @@ -26,7 +27,7 @@ latin:passwordInput="true" > <include - latin:keyboardLayout="@xml/key_styles_currency_dollar" /> + latin:keyboardLayout="@xml/key_dollar" /> </case> <!-- Countries using Euro currency, 23 countries as of November 2012. 1. Andorra (ca_AD, ca_ES) @@ -56,7 +57,7 @@ latin:countryCode="AD|AT|BE|CY|EE|FI|FR|DE|GR|IE|IT|XK|LU|MT|MO|ME|NL|PT|SM|SK|SI|ES|VA" > <include - latin:keyboardLayout="@xml/key_styles_currency_euro" /> + latin:keyboardLayout="@xml/key_euro" /> </case> <!-- Note: Some subtype locale may not have country code, and it it supposed to indicate the country where the language originally/mainly spoken. --> @@ -80,7 +81,7 @@ latin:localeCode="da|de|es|el|fi|fr|it|nl|sk|sl|sv|tr" > <include - latin:keyboardLayout="@xml/key_styles_currency_euro" /> + latin:keyboardLayout="@xml/key_euro" /> </case> <!-- ca: Catalan (Andorra, Spain) et: Estonian (Estonia) @@ -90,7 +91,7 @@ latin:languageCode="ca|et|lb|mt" > <include - latin:keyboardLayout="@xml/key_styles_currency_euro" /> + latin:keyboardLayout="@xml/key_euro" /> </case> <!-- fa: Persian (Rial and Afgahni) hi: Hindi (Indian Rupee) @@ -104,26 +105,9 @@ <case latin:languageCode="fa|hi|iw|mn|th|uk|vi" > - <!-- U+00A3: "£" POUND SIGN - U+20AC: "€" EURO SIGN - U+00A2: "¢" CENT SIGN --> - <key-style - latin:styleName="currencyKeyStyle" - latin:keyLabel="!text/keylabel_for_currency_generic" - latin:moreKeys="!text/more_keys_for_currency_generic" /> - <key-style - latin:styleName="moreCurrency1KeyStyle" - latin:keyLabel="£" /> - <key-style - latin:styleName="moreCurrency2KeyStyle" - latin:keyLabel="€" /> - <key-style - latin:styleName="moreCurrency3KeyStyle" - latin:keyLabel="$" - latin:moreKeys="¢" /> - <key-style - latin:styleName="moreCurrency4KeyStyle" - latin:keyLabel="¢" /> + <Key + latin:keyLabel="!text/keylabel_for_currency" + latin:moreKeys="!text/more_keys_for_currency" /> </case> <!-- GB: United Kingdom (Pound) --> <case @@ -134,28 +118,14 @@ U+00A5: "¥" YEN SIGN U+00A2: "¢" CENT SIGN U+20B1: "₱" PESO SIGN --> - <key-style - latin:styleName="currencyKeyStyle" + <Key latin:keyLabel="£" latin:moreKeys="¢,$,€,¥,₱" /> - <key-style - latin:styleName="moreCurrency1KeyStyle" - latin:keyLabel="€" /> - <key-style - latin:styleName="moreCurrency2KeyStyle" - latin:keyLabel="¥" /> - <key-style - latin:styleName="moreCurrency3KeyStyle" - latin:keyLabel="$" - latin:moreKeys="¢" /> - <key-style - latin:styleName="moreCurrency4KeyStyle" - latin:keyLabel="¢" /> </case> <!-- ar: Arabic (Dollar and Rial) --> <default> <include - latin:keyboardLayout="@xml/key_styles_currency_dollar" /> + latin:keyboardLayout="@xml/key_dollar" /> </default> </switch> </merge> diff --git a/java/res/xml/key_styles_currency_dollar.xml b/java/res/xml/key_dollar.xml index 674a3966d..118c7a291 100644 --- a/java/res/xml/key_styles_currency_dollar.xml +++ b/java/res/xml/key_dollar.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2011, The Android Open Source Project +** 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. @@ -23,20 +23,7 @@ U+00A2: "¢" CENT SIGN U+20AC: "€" EURO SIGN U+00A5: "¥" YEN SIGN --> - <key-style - latin:styleName="currencyKeyStyle" + <Key latin:keyLabel="$" latin:moreKeys="!text/more_keys_for_currency_dollar" /> - <key-style - latin:styleName="moreCurrency1KeyStyle" - latin:keyLabel="£" /> - <key-style - latin:styleName="moreCurrency2KeyStyle" - latin:keyLabel="¢" /> - <key-style - latin:styleName="moreCurrency3KeyStyle" - latin:keyLabel="€" /> - <key-style - latin:styleName="moreCurrency4KeyStyle" - latin:keyLabel="¥" /> </merge> diff --git a/java/res/xml/key_styles_currency_euro.xml b/java/res/xml/key_euro.xml index c1b5e0384..820ced97c 100644 --- a/java/res/xml/key_styles_currency_euro.xml +++ b/java/res/xml/key_euro.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2011, The Android Open Source Project +** 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. @@ -24,21 +24,7 @@ U+00A3: "£" POUND SIGN U+00A5: "¥" YEN SIGN U+20B1: "₱" PESO SIGN --> - <key-style - latin:styleName="currencyKeyStyle" + <Key latin:keyLabel="€" latin:moreKeys="¢,£,$,¥,₱" /> - <key-style - latin:styleName="moreCurrency1KeyStyle" - latin:keyLabel="£" /> - <key-style - latin:styleName="moreCurrency2KeyStyle" - latin:keyLabel="¥" /> - <key-style - latin:styleName="moreCurrency3KeyStyle" - latin:keyLabel="$" - latin:moreKeys="¢" /> - <key-style - latin:styleName="moreCurrency4KeyStyle" - latin:keyLabel="¢" /> </merge> diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index 355455e3b..dabe1e7eb 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -179,15 +179,6 @@ latin:keyLabel="!text/label_to_alpha_key" latin:parentStyle="baseForLayoutSwitchKeyStyle" /> <key-style - latin:styleName="toMoreSymbolKeyStyle" - latin:code="!code/key_shift" - latin:keyLabel="!text/label_to_more_symbol_key" - latin:parentStyle="baseForLayoutSwitchKeyStyle" /> - <key-style - latin:styleName="backFromMoreSymbolKeyStyle" - latin:code="!code/key_shift" - latin:parentStyle="baseForToSymbolKeyStyle" /> - <key-style latin:styleName="punctuationKeyStyle" latin:keyLabel="." latin:keyLabelFlags="hasPopupHint" diff --git a/java/res/xml/key_symbols_period.xml b/java/res/xml/key_symbols_period.xml new file mode 100644 index 000000000..6efc9dee3 --- /dev/null +++ b/java/res/xml/key_symbols_period.xml @@ -0,0 +1,47 @@ +<?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. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <!-- U+2105: "℅" CARE OF + U+2122: "™" TRADE MARK SIGN + U+00AE: "®" REGISTERED SIGN + U+00A9: "©" COPYRIGHT SIGN + U+00A7: "§" SECTION SIGN + U+00B6: "¶" PILCROW SIGN + U+002C: "," COMMA + U+2022: "•" BULLET --> + <!-- U+00B0: "°" DEGREE SIGN + U+2032: "′" PRIME + U+2033: "″" DOUBLE PRIME + U+2191: "↑" UPWARDS ARROW + U+2193: "↓" DOWNWARDS ARROW + U+2190: "←" LEFTWARDS ARROW + U+2192: "→" RIGHTWARDS ARROW + U+2026: "…" HORIZONTAL ELLIPSIS --> + <!-- U+0394: "Δ" GREEK CAPITAL LETTER DELTA + U+03A0: "Π" GREEK CAPITAL LETTER PI + U+03C0: "π" GREEK SMALL LETTER PI --> + <Key + latin:keyLabel="." + latin:keyLabelFlags="hasPopupHint" + latin:moreKeys="!fixedColumnOrder!8,℅,™,®,©,§,¶,\\,,•,°,′,″,↑,↓,←,→,…,!text/more_keys_for_bullet,Δ,Π,π" /> +</merge> diff --git a/java/res/xml/keyboard_layout_set_arabic.xml b/java/res/xml/keyboard_layout_set_arabic.xml index 10e95bd30..9eb11dc5e 100644 --- a/java/res/xml/keyboard_layout_set_arabic.xml +++ b/java/res/xml/keyboard_layout_set_arabic.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_azerty.xml b/java/res/xml/keyboard_layout_set_azerty.xml index 4d144edbc..03d8ce72b 100644 --- a/java/res/xml/keyboard_layout_set_azerty.xml +++ b/java/res/xml/keyboard_layout_set_azerty.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_10_10_7_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_bulgarian.xml b/java/res/xml/keyboard_layout_set_bulgarian.xml index c6fdff9a2..0b92af8e4 100644 --- a/java/res/xml/keyboard_layout_set_bulgarian.xml +++ b/java/res/xml/keyboard_layout_set_bulgarian.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_bulgarian_bds.xml b/java/res/xml/keyboard_layout_set_bulgarian_bds.xml index a36b3bd52..d185a85b4 100644 --- a/java/res/xml/keyboard_layout_set_bulgarian_bds.xml +++ b/java/res/xml/keyboard_layout_set_bulgarian_bds.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_colemak.xml b/java/res/xml/keyboard_layout_set_colemak.xml index c18f13225..fd4254291 100644 --- a/java/res/xml/keyboard_layout_set_colemak.xml +++ b/java/res/xml/keyboard_layout_set_colemak.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_10_10_7_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_dvorak.xml b/java/res/xml/keyboard_layout_set_dvorak.xml index eb8e0c539..851a27117 100644 --- a/java/res/xml/keyboard_layout_set_dvorak.xml +++ b/java/res/xml/keyboard_layout_set_dvorak.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_10_10_7_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_east_slavic.xml b/java/res/xml/keyboard_layout_set_east_slavic.xml index 8d66faf8f..9dc284668 100644 --- a/java/res/xml/keyboard_layout_set_east_slavic.xml +++ b/java/res/xml/keyboard_layout_set_east_slavic.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_emoji.xml b/java/res/xml/keyboard_layout_set_emoji.xml new file mode 100644 index 000000000..98e6b6b5c --- /dev/null +++ b/java/res/xml/keyboard_layout_set_emoji.xml @@ -0,0 +1,44 @@ +<?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. +*/ +--> + +<KeyboardLayoutSet + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Element + latin:elementName="emojiRecents" + latin:elementKeyboard="@xml/kbd_emoji_recents" /> + <Element + latin:elementName="emojiCategory1" + latin:elementKeyboard="@xml/kbd_emoji_category1" /> + <Element + latin:elementName="emojiCategory2" + latin:elementKeyboard="@xml/kbd_emoji_category2" /> + <Element + latin:elementName="emojiCategory3" + latin:elementKeyboard="@xml/kbd_emoji_category3" /> + <Element + latin:elementName="emojiCategory4" + latin:elementKeyboard="@xml/kbd_emoji_category4" /> + <Element + latin:elementName="emojiCategory5" + latin:elementKeyboard="@xml/kbd_emoji_category5" /> + <Element + latin:elementName="emojiCategory6" + latin:elementKeyboard="@xml/kbd_emoji_category6" /> +</KeyboardLayoutSet> diff --git a/java/res/xml/keyboard_layout_set_farsi.xml b/java/res/xml/keyboard_layout_set_farsi.xml index b9a91e3a8..ef29e1ae8 100644 --- a/java/res/xml/keyboard_layout_set_farsi.xml +++ b/java/res/xml/keyboard_layout_set_farsi.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_georgian.xml b/java/res/xml/keyboard_layout_set_georgian.xml index 36d091653..181c99713 100644 --- a/java/res/xml/keyboard_layout_set_georgian.xml +++ b/java/res/xml/keyboard_layout_set_georgian.xml @@ -44,9 +44,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_greek.xml b/java/res/xml/keyboard_layout_set_greek.xml index b376e4fe3..2e4a28692 100644 --- a/java/res/xml/keyboard_layout_set_greek.xml +++ b/java/res/xml/keyboard_layout_set_greek.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_hebrew.xml b/java/res/xml/keyboard_layout_set_hebrew.xml index 212816dfe..c8ac31c7e 100644 --- a/java/res/xml/keyboard_layout_set_hebrew.xml +++ b/java/res/xml/keyboard_layout_set_hebrew.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_10_10_7_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_hindi.xml b/java/res/xml/keyboard_layout_set_hindi.xml index e850c7ebc..1bd3d72fb 100644 --- a/java/res/xml/keyboard_layout_set_hindi.xml +++ b/java/res/xml/keyboard_layout_set_hindi.xml @@ -44,9 +44,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_mongolian.xml b/java/res/xml/keyboard_layout_set_mongolian.xml index 2d364f682..bbf3c0945 100644 --- a/java/res/xml/keyboard_layout_set_mongolian.xml +++ b/java/res/xml/keyboard_layout_set_mongolian.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_nordic.xml b/java/res/xml/keyboard_layout_set_nordic.xml index 1f00f440e..ce6fc635b 100644 --- a/java/res/xml/keyboard_layout_set_nordic.xml +++ b/java/res/xml/keyboard_layout_set_nordic.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_pcqwerty.xml b/java/res/xml/keyboard_layout_set_pcqwerty.xml index 9367ed00c..67fbd9159 100644 --- a/java/res/xml/keyboard_layout_set_pcqwerty.xml +++ b/java/res/xml/keyboard_layout_set_pcqwerty.xml @@ -25,12 +25,6 @@ latin:elementKeyboard="@xml/kbd_pcqwerty" latin:enableProximityCharsCorrection="true" /> <Element - latin:elementName="symbols" - latin:elementKeyboard="@xml/kbd_pcqwerty_symbols" /> - <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_pcqwerty_symbols" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_qwerty.xml b/java/res/xml/keyboard_layout_set_qwerty.xml index 821517081..98b3582d4 100644 --- a/java/res/xml/keyboard_layout_set_qwerty.xml +++ b/java/res/xml/keyboard_layout_set_qwerty.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_qwertz.xml b/java/res/xml/keyboard_layout_set_qwertz.xml index f9e87a66f..789dcfa62 100644 --- a/java/res/xml/keyboard_layout_set_qwertz.xml +++ b/java/res/xml/keyboard_layout_set_qwertz.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_south_slavic.xml b/java/res/xml/keyboard_layout_set_south_slavic.xml index 36666b91b..eaeaa1c4b 100644 --- a/java/res/xml/keyboard_layout_set_south_slavic.xml +++ b/java/res/xml/keyboard_layout_set_south_slavic.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_spanish.xml b/java/res/xml/keyboard_layout_set_spanish.xml index 57cef5234..500e23a10 100644 --- a/java/res/xml/keyboard_layout_set_spanish.xml +++ b/java/res/xml/keyboard_layout_set_spanish.xml @@ -28,9 +28,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_10_10_7_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keyboard_layout_set_thai.xml b/java/res/xml/keyboard_layout_set_thai.xml index 94713e3d4..146b413d2 100644 --- a/java/res/xml/keyboard_layout_set_thai.xml +++ b/java/res/xml/keyboard_layout_set_thai.xml @@ -44,9 +44,6 @@ latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_thai_symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_thai_symbols_shift" /> - <Element latin:elementName="phone" latin:elementKeyboard="@xml/kbd_phone" /> <Element diff --git a/java/res/xml/keys_parentheses.xml b/java/res/xml/keys_parentheses.xml deleted file mode 100644 index 25e89c930..000000000 --- a/java/res/xml/keys_parentheses.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <Key - latin:keyLabel="(" - latin:code="!code/key_left_parenthesis" - latin:moreKeys="!text/more_keys_for_left_parenthesis" /> - <Key - latin:keyLabel=")" - latin:code="!code/key_right_parenthesis" - latin:moreKeys="!text/more_keys_for_right_parenthesis" /> -</merge> diff --git a/java/res/xml/keys_pcqwerty2_right3.xml b/java/res/xml/keys_pcqwerty2_right3.xml index 2065e6b46..6f86477da 100644 --- a/java/res/xml/keys_pcqwerty2_right3.xml +++ b/java/res/xml/keys_pcqwerty2_right3.xml @@ -27,25 +27,22 @@ > <Key latin:keyLabel="[" - latin:moreKeys="{" /> + latin:additionalMoreKeys="{" /> <Key latin:keyLabel="]" - latin:moreKeys="}" /> - <!-- U+00A6: "¦" BROKEN BAR --> + latin:additionalMoreKeys="}" /> <Key latin:keyLabel="\\" - latin:moreKeys="\\|,¦" /> + latin:additionalMoreKeys="\\|" /> </case> - <!-- keyboardLayoutSetElement="alphabet*Shifted|symbols*" --> + <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> <default> <Key latin:keyLabel="{" /> <Key latin:keyLabel="}" /> - <!-- U+00A6: "¦" BROKEN BAR --> <Key - latin:keyLabel="|" - latin:moreKeys="¦" /> + latin:keyLabel="|" /> </default> </switch> </merge> diff --git a/java/res/xml/keys_pcqwerty3_right2.xml b/java/res/xml/keys_pcqwerty3_right2.xml index aa150afb3..8da145b20 100644 --- a/java/res/xml/keys_pcqwerty3_right2.xml +++ b/java/res/xml/keys_pcqwerty3_right2.xml @@ -27,12 +27,13 @@ > <Key latin:keyLabel=";" - latin:moreKeys=":" /> + latin:additionalMoreKeys=":" /> <Key latin:keyLabel="\'" - latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,",!text/single_quotes" /> + latin:additionalMoreKeys=""" + latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,%,!text/single_quotes" /> </case> - <!-- keyboardLayoutSetElement="alphabet*Shifted|symbols*" --> + <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> <default> <Key latin:keyLabel=":" /> diff --git a/java/res/xml/keys_pcqwerty4_right3.xml b/java/res/xml/keys_pcqwerty4_right3.xml index 7795b3d8b..e6084cb45 100644 --- a/java/res/xml/keys_pcqwerty4_right3.xml +++ b/java/res/xml/keys_pcqwerty4_right3.xml @@ -27,16 +27,16 @@ > <Key latin:keyLabel="," - latin:moreKeys="<" /> + latin:additionalMoreKeys="<" /> <Key latin:keyLabel="." - latin:moreKeys=">" /> - <!-- U+00BF: "¿" INVERTED QUESTION MARK --> + latin:additionalMoreKeys=">" /> <Key latin:keyLabel="/" - latin:moreKeys="\?,¿" /> + latin:additionalMoreKeys="\?" + latin:moreKeys="!text/more_keys_for_symbols_question" /> </case> - <!-- keyboardLayoutSetElement="alphabet*Shifted|symbols*" --> + <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> <default> <!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK @@ -50,10 +50,9 @@ <Key latin:keyLabel=">" latin:moreKeys="!fixedColumnOrder!3,›,≥,»" /> - <!-- U+00BF: "¿" INVERTED QUESTION MARK --> <Key latin:keyLabel="\?" - latin:moreKeys="¿" /> + latin:moreKeys="!text/more_keys_for_symbols_question" /> </default> </switch> </merge> diff --git a/java/res/xml/keys_pcqwerty_symbols2.xml b/java/res/xml/keys_pcqwerty_symbols2.xml deleted file mode 100644 index d0ea984e8..000000000 --- a/java/res/xml/keys_pcqwerty_symbols2.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <!-- U+2022: "•" BULLET --> - <Key - latin:keyLabel="•" - latin:moreKeys="!text/more_keys_for_bullet" /> - <!-- U+00B1: "±" PLUS-MINUS SIGN --> - <Key - latin:keyLabel="±" /> - <!-- U+00AC: "¬" NOT SIGN --> - <Key - latin:keyLabel="¬" /> - <!-- U+00A6: "¦" BROKEN BAR --> - <Key - latin:keyLabel="¦" /> - <!-- U+221A: "√" SQUARE ROOT --> - <Key - latin:keyLabel="√" /> - <!-- U+03C0: "π" GREEK SMALL LETTER PI - U+03A0: "Π" GREEK CAPITAL LETTER PI --> - <Key - latin:keyLabel="π" - latin:moreKeys="Π" /> - <!-- U+03CC: "σ" GREEK SMALL LETTER SIGMA - U+03A3: "Σ" GREEK CAPITAL LETTER SIGMA --> - <Key - latin:keyLabel="σ" - latin:moreKeys="Σ" /> - <!-- U+00B5: "µ" MICRO SIGN --> - <Key - latin:keyLabel="µ" /> - <!-- U+00F7: "÷" DIVISION SIGN --> - <Key - latin:keyLabel="÷" /> - <!-- U+00D7: "×" MULTIPLICATION SIGN --> - <Key - latin:keyLabel="×" /> -</merge> diff --git a/java/res/xml/keys_pcqwerty_symbols3.xml b/java/res/xml/keys_pcqwerty_symbols3.xml deleted file mode 100644 index 35279deaf..000000000 --- a/java/res/xml/keys_pcqwerty_symbols3.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <!-- U+00A3: "£" POUND SIGN; --> - <Key - latin:keyLabel="£" /> - <!-- U+00A2: "¢" CENT SIGN --> - <Key - latin:keyLabel="¢" /> - <!-- U+20AC: "€" EURO SIGN --> - <Key - latin:keyLabel="€" /> - <!-- U+00A5: "¥" YEN SIGN --> - <Key - latin:keyLabel="¥" /> - <!-- U+00A4: "¤" CURRENCY SIGN --> - <Key - latin:keyLabel="¤" /> - <!-- U+00B0: "°" DEGREE SIGN - U+2032: "′" PRIME - U+2033: "″" DOUBLE PRIME --> - <Key - latin:keyLabel="°" - latin:moreKeys="′,″" /> - <!-- U+2260: "≠" NOT EQUAL TO --> - <Key - latin:keyLabel="≠" /> - <!-- U+2248: "≈" ALMOST EQUAL TO --> - <Key - latin:keyLabel="≈" /> - <!-- U+221E: "∞" INFINITY --> - <Key - latin:keyLabel="∞" /> -</merge> diff --git a/java/res/xml/keys_pcqwerty_symbols4.xml b/java/res/xml/keys_pcqwerty_symbols4.xml deleted file mode 100644 index 3c628f0e0..000000000 --- a/java/res/xml/keys_pcqwerty_symbols4.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <!-- U+2122: "™" TRADE MARK SIGN --> - <Key - latin:keyLabel="™" /> - <!-- U+00AE: "®" REGISTERED SIGN --> - <Key - latin:keyLabel="®" /> - <!-- U+00A9: "©" COPYRIGHT SIGN --> - <Key - latin:keyLabel="©" /> - <!-- U+00B6: "¶" PILCROW SIGN --> - <Key - latin:keyLabel="¶" /> - <!-- U+00A7: "§" SECTION SIGN --> - <Key - latin:keyLabel="§" /> - <!-- U+2191: "↑" UPWARDS ARROW - U+2193: "↓" DOWNWARDS ARROW - U+2190: "←" LEFTWARDS ARROW - U+2192: "→" RIGHTWARDS ARROW --> - <Key - latin:keyLabel="↑" - latin:moreKeys="↓" /> - <Key - latin:keyLabel="←" - latin:moreKeys="→" /> -</merge> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 52d715a7a..2c3ac57ed 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -24,7 +24,7 @@ keyboard_locale: script_name/keyboard_layout_set af: Afrikaans/qwerty ar: Arabic/arabic - (az: Azerbaijani/qwerty) # disabled temporarily. waiting for strnig resources. + az: Azerbaijani/qwerty be: Belarusian/east_slavic bg: Bulgarian/bulgarian bg: Bulgarian/bulgarian_bds @@ -117,7 +117,6 @@ android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="SupportTouchPositionCorrection" /> - <!-- <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" android:subtypeId="0x70b0f974" @@ -125,7 +124,6 @@ android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" /> - --> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" android:subtypeId="0x1dc3a859" diff --git a/java/res/xml/row_pcqwerty5.xml b/java/res/xml/row_pcqwerty5.xml index a8940af6e..0e618059e 100644 --- a/java/res/xml/row_pcqwerty5.xml +++ b/java/res/xml/row_pcqwerty5.xml @@ -24,36 +24,23 @@ <Row latin:keyWidth="7.692%p" > - <switch> - <case - latin:keyboardLayoutSetElement="symbols|symbolsShifted" - > - <Key - latin:keyStyle="toAlphaKeyStyle" - latin:keyWidth="11.538%p" /> - </case> - <!-- keyboardLayoutSetElement="alphabet*" --> - <default> - <Key - latin:keyStyle="toSymbolKeyStyle" - latin:keyIcon="!icon/undefined" - latin:keyLabel="!text/label_to_symbol_key_pcqwerty" - latin:keyWidth="11.538%p" /> - </default> - </switch> + <Spacer + latin:keyWidth="11.538%p" /> <switch> <case latin:shortcutKeyEnabled="true" > <Key - latin:keyStyle="shortcutKeyStyle" /> - </case> + latin:keyStyle="shortcutKeyStyle" + latin:keyWidth="11.538%p" /> + </case> <case latin:clobberSettingsKey="false" > <Key - latin:keyStyle="settingsKeyStyle" /> - </case> + latin:keyStyle="settingsKeyStyle" + latin:keyWidth="11.538%p" /> + </case> </switch> <switch> <case @@ -61,21 +48,33 @@ > <Key latin:keyStyle="languageSwitchKeyStyle" - latin:keyXPos="19.230%p" /> + latin:keyWidth="11.538%p" /> <Key latin:keyStyle="spaceKeyStyle" - latin:keyWidth="53.844%p" /> - </case> + latin:keyWidth="42.310%p" /> + </case> <!-- languageSwitchKeyEnabled="false" --> <default> <Key latin:keyStyle="spaceKeyStyle" - latin:keyXPos="19.230%p" - latin:keyWidth="61.536%p" /> + latin:keyWidth="53.848%p" /> </default> </switch> <Key - latin:keyStyle="enterKeyStyle" - latin:keyWidth="fillRight" /> + latin:keyStyle="defaultEnterKeyStyle" + latin:keyWidth="15.384%p" /> + <switch> + <case + latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" + > + <Spacer /> + </case> + <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> + <default> + <include + latin:keyboardLayout="@xml/key_symbols_period" + latin:backgroundType="functional" /> + </default> + </switch> </Row> </merge> diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml index 150ad486c..5c15da6a5 100644 --- a/java/res/xml/row_symbols4.xml +++ b/java/res/xml/row_symbols4.xml @@ -46,8 +46,9 @@ <include latin:keyXPos="25%p" latin:keyboardLayout="@xml/key_space" /> - <Key - latin:keyStyle="punctuationKeyStyle" /> + <include + latin:keyboardLayout="@xml/key_symbols_period" + latin:backgroundType="functional" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillRight" /> diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml deleted file mode 100644 index 99a685c45..000000000 --- a/java/res/xml/row_symbols_shift4.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <Row - latin:keyWidth="10%p" - > - <Key - latin:keyStyle="toAlphaKeyStyle" - latin:keyWidth="15%p" /> - <!-- U+201A: "‚" SINGLE LOW-9 QUOTATION MARK - U+201E: "„" DOUBLE LOW-9 QUOTATION MARK --> - <Key - latin:keyLabel="„" - latin:moreKeys="‚" - latin:backgroundType="functional" /> - <include - latin:keyXPos="25%p" - latin:keyboardLayout="@xml/key_space" /> - <!-- U+2026: "…" HORIZONTAL ELLIPSIS --> - <Key - latin:keyLabel="…" - latin:backgroundType="functional" /> - <Key - latin:keyStyle="enterKeyStyle" - latin:keyWidth="fillRight" /> - </Row> -</merge> diff --git a/java/res/xml/rowkeys_pcqwerty1.xml b/java/res/xml/rowkeys_pcqwerty1.xml index b2d1d374b..de548d0ba 100644 --- a/java/res/xml/rowkeys_pcqwerty1.xml +++ b/java/res/xml/rowkeys_pcqwerty1.xml @@ -21,67 +21,61 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <switch> - <case - latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" - > - <!-- U+00AC: "¬" NOT SIGN --> - <Key - latin:keyLabel="`" - latin:moreKeys="~" - latin:additionalMoreKeys="¬" /> - <!-- U+00A1: "¡" NVERTED EXCLAMATION MARK --> - <Key - latin:keyLabel="1" - latin:additionalMoreKeys="!" - latin:moreKeys="¡,!text/more_keys_for_symbols_1" /> - <Key - latin:keyLabel="2" - latin:additionalMoreKeys="\@" - latin:moreKeys="!text/more_keys_for_symbols_2" /> - <Key - latin:keyLabel="3" - latin:additionalMoreKeys="\#" - latin:moreKeys="!text/more_keys_for_symbols_3" /> - <Key - latin:keyLabel="4" - latin:additionalMoreKeys="$" - latin:moreKeys="!text/more_keys_for_symbols_4" /> - <Key - latin:keyLabel="5" - latin:additionalMoreKeys="\\%" - latin:moreKeys="!text/more_keys_for_symbols_5" /> - <Key - latin:keyLabel="6" - latin:additionalMoreKeys="^" - latin:moreKeys="!text/more_keys_for_symbols_6" /> - <Key - latin:keyLabel="7" - latin:additionalMoreKeys="&" - latin:moreKeys="!text/more_keys_for_symbols_7" /> - <Key - latin:keyLabel="8" - latin:additionalMoreKeys="*,%" - latin:moreKeys="!text/more_keys_for_symbols_8" /> - <Key - latin:keyLabel="9" - latin:additionalMoreKeys="(" - latin:moreKeys="!text/more_keys_for_symbols_9" /> - <Key - latin:keyLabel="0" - latin:additionalMoreKeys=")" - latin:moreKeys="!text/more_keys_for_symbols_0" /> - <Key - latin:keyLabel="-" - latin:moreKeys="_" /> - <Key - latin:keyLabel="=" - latin:moreKeys="+" /> - </case> - <!-- keyboardLayoutSetElement="alphabet*Shifted|symbols*" --> - <default> - <include - latin:keyboardLayout="@xml/keys_pcqwerty_symbols1" /> - </default> - </switch> + <Key + latin:keyLabel="`" + latin:additionalMoreKeys="~" /> + <Key + latin:keyLabel="1" + latin:additionalMoreKeys="!,!text/more_keys_for_symbols_exclamation" + latin:moreKeys="!text/more_keys_for_symbols_1" /> + <Key + latin:keyLabel="2" + latin:additionalMoreKeys="\@" + latin:moreKeys="!text/more_keys_for_symbols_2" /> + <Key + latin:keyLabel="3" + latin:additionalMoreKeys="\#" + latin:moreKeys="!text/more_keys_for_symbols_3" /> + <Key + latin:keyLabel="4" + latin:additionalMoreKeys="$" + latin:moreKeys="!text/more_keys_for_symbols_4" /> + <Key + latin:keyLabel="5" + latin:additionalMoreKeys="\\%" + latin:moreKeys="!text/more_keys_for_symbols_5" /> + <Key + latin:keyLabel="6" + latin:additionalMoreKeys="^" + latin:moreKeys="!text/more_keys_for_symbols_6" /> + <Key + latin:keyLabel="7" + latin:additionalMoreKeys="&" + latin:moreKeys="!text/more_keys_for_symbols_7" /> + <Key + latin:keyLabel="8" + latin:additionalMoreKeys="*" + latin:moreKeys="!text/more_keys_for_symbols_8" /> + <Key + latin:keyLabel="9" + latin:additionalMoreKeys="(" + latin:moreKeys="!text/more_keys_for_symbols_9" /> + <Key + latin:keyLabel="0" + latin:additionalMoreKeys=")" + latin:moreKeys="!text/more_keys_for_symbols_0" /> + <!-- U+2013: "–" EN DASH + U+2014: "—" EM DASH + U+00B7: "·" MIDDLE DOT --> + <Key + latin:keyLabel="-" + latin:additionalMoreKeys="_" + latin:moreKeys="–,—,·" /> + <!-- U+221E: "∞" INFINITY + U+2260: "≠" NOT EQUAL TO + U+2248: "≈" ALMOST EQUAL TO --> + <Key + latin:keyLabel="=" + latin:additionalMoreKeys="+" + latin:moreKeys="!fixedColumnOrder!4,∞,≠,≈,%" /> </merge> diff --git a/java/res/xml/keys_pcqwerty_symbols1.xml b/java/res/xml/rowkeys_pcqwerty1_shift.xml index 2364e1087..bc39f944e 100644 --- a/java/res/xml/keys_pcqwerty_symbols1.xml +++ b/java/res/xml/rowkeys_pcqwerty1_shift.xml @@ -21,37 +21,40 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <!-- U+00AC: "¬" NOT SIGN --> <Key - latin:keyLabel="~" - latin:moreKeys="¬" /> - <!-- U+00A1: "¡" NVERTED EXCLAMATION MARK --> + latin:keyLabel="~" /> <Key latin:keyLabel="!" - latin:moreKeys="¡" /> + latin:additionalMoreKeys="!text/more_keys_for_symbols_exclamation" /> <Key latin:keyLabel="\@" /> <Key latin:keyLabel="\#" /> <Key - latin:keyLabel="$" /> - <!-- U+2030: "‰" PER MILLE SIGN --> + latin:keyLabel="$" + latin:additionalMoreKeys="!text/more_keys_for_currency_dollar" /> <Key latin:keyLabel="%" - latin:moreKeys="‰" /> + latin:additionalMoreKeys="!text/more_keys_for_symbols_percent" /> <Key latin:keyLabel="^" /> <Key latin:keyLabel="&" /> <Key latin:keyLabel="*" - latin:moreKeys="!text/more_keys_for_star" /> + latin:additionalMoreKeys="!text/more_keys_for_star" /> <Key latin:keyLabel="(" /> <Key latin:keyLabel=")" /> <Key latin:keyLabel="_" /> - <Key - latin:keyLabel="+" /> + <!-- U+00B1: "±" PLUS-MINUS SIGN + U+00D7: "×" MULTIPLICATION SIGN + U+00F7: "÷" DIVISION SIGN + U+221A: "√" SQUARE ROOT --> + <Key + latin:keyLabel="+" + latin:additionalMoreKeys="!text/more_keys_for_plus" + latin:moreKeys="±,×,÷,√" /> </merge> diff --git a/java/res/xml/rowkeys_pcqwerty2.xml b/java/res/xml/rowkeys_pcqwerty2.xml index cedf47559..8db704d71 100644 --- a/java/res/xml/rowkeys_pcqwerty2.xml +++ b/java/res/xml/rowkeys_pcqwerty2.xml @@ -21,21 +21,11 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <switch> - <case - latin:keyboardLayoutSetElement="symbols|symbolsShifted" - > - <include - latin:keyboardLayout="@xml/keys_pcqwerty_symbols2" /> - </case> - <default> - <!-- The keys on this PC layout row2 consist of the letters of QWERTY layout row1 and - some symbols keys. --> - <include - latin:keyboardLayout="@xml/rowkeys_qwerty1" - latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> - </default> - </switch> + <!-- The keys on this PC layout row2 consist of the letters of QWERTY layout row1 and + some symbols keys. --> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty1" + latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> <include latin:keyboardLayout="@xml/keys_pcqwerty2_right3" /> </merge> diff --git a/java/res/xml/rowkeys_pcqwerty3.xml b/java/res/xml/rowkeys_pcqwerty3.xml index 5044e5feb..ad122d30c 100644 --- a/java/res/xml/rowkeys_pcqwerty3.xml +++ b/java/res/xml/rowkeys_pcqwerty3.xml @@ -21,20 +21,10 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <switch> - <case - latin:keyboardLayoutSetElement="symbols|symbolsShifted" - > - <include - latin:keyboardLayout="@xml/keys_pcqwerty_symbols3" /> - </case> - <default> - <!-- The keys on this PC layout row3 consist of the letters of QWERTY layout row2 and - some symbols keys. --> - <include - latin:keyboardLayout="@xml/rowkeys_qwerty2" /> - </default> - </switch> + <!-- The keys on this PC layout row3 consist of the letters of QWERTY layout row2 and + some symbols keys. --> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty2" /> <include latin:keyboardLayout="@xml/keys_pcqwerty3_right2" /> </merge> diff --git a/java/res/xml/rowkeys_pcqwerty4.xml b/java/res/xml/rowkeys_pcqwerty4.xml index 4071e8c09..b558f4142 100644 --- a/java/res/xml/rowkeys_pcqwerty4.xml +++ b/java/res/xml/rowkeys_pcqwerty4.xml @@ -21,20 +21,10 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <switch> - <case - latin:keyboardLayoutSetElement="symbols|symbolsShifted" - > - <include - latin:keyboardLayout="@xml/keys_pcqwerty_symbols4" /> - </case> - <default> - <!-- The keys on this PC layout row4 consist of the letters of QWERTY layout row3 and - some symbols keys. --> - <include - latin:keyboardLayout="@xml/rowkeys_qwerty3" /> - </default> - </switch> + <!-- The keys on this PC layout row4 consist of the letters of QWERTY layout row3 and + some symbols keys. --> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty3" /> <include latin:keyboardLayout="@xml/keys_pcqwerty4_right3" /> </merge> diff --git a/java/res/xml/rowkeys_symbols2.xml b/java/res/xml/rowkeys_symbols2.xml index 3e27f1579..9d629f1c8 100644 --- a/java/res/xml/rowkeys_symbols2.xml +++ b/java/res/xml/rowkeys_symbols2.xml @@ -43,8 +43,12 @@ latin:keyLabel="\#" /> </default> </switch> - <Key - latin:keyStyle="currencyKeyStyle" /> + <!-- TODO: Remove key_currency.xml and uncomment the following definition. --> +<!-- <Key --> +<!-- latin:keyLabel="!text/keylabel_for_currency" --> +<!-- latin:moreKeys="!text/more_keys_for_currency" /> --> + <include + latin:keyboardLayout="@xml/key_currency" /> <Key latin:keyLabel="!text/keylabel_for_symbols_percent" latin:moreKeys="!text/more_keys_for_symbols_percent" /> @@ -53,15 +57,27 @@ <Key latin:keyLabel="*" latin:moreKeys="!text/more_keys_for_star" /> - <!-- U+2013: "–" EN DASH - U+2014: "—" EM DASH - U+00B7: "·" MIDDLE DOT --> + <!-- U+00B1: "±" PLUS-MINUS SIGN + U+00D7: "×" MULTIPLICATION SIGN + U+00F7: "÷" DIVISION SIGN + U+221A: "√" SQUARE ROOT --> + <Key + latin:keyLabel="+" + latin:moreKeys="!text/more_keys_for_plus,±,×,÷,√" /> + <!-- U+221E: "∞" INFINITY + U+2264: "≤" LESS-THAN OR EQUAL TO + U+2265: "≥" GREATER-THAN EQUAL TO + U+2260: "≠" NOT EQUAL TO + U+2248: "≈" ALMOST EQUAL TO --> <Key - latin:keyLabel="-" - latin:moreKeys="_,–,—,·" /> + latin:keyLabel="=" + latin:moreKeys="!fixedColumnOrder!5,∞,≤,≥,≠,≈" /> <Key - latin:keyLabel="+" - latin:moreKeys="!text/more_keys_for_plus" /> - <include - latin:keyboardLayout="@xml/keys_parentheses" /> + latin:keyLabel="(" + latin:code="!code/key_left_parenthesis" + latin:moreKeys="!text/more_keys_for_left_parenthesis" /> + <Key + latin:keyLabel=")" + latin:code="!code/key_right_parenthesis" + latin:moreKeys="!text/more_keys_for_right_parenthesis" /> </merge> diff --git a/java/res/xml/rowkeys_symbols3.xml b/java/res/xml/rowkeys_symbols3.xml index 7722ca9ae..9e9dfd8bd 100644 --- a/java/res/xml/rowkeys_symbols3.xml +++ b/java/res/xml/rowkeys_symbols3.xml @@ -24,6 +24,9 @@ <Key latin:keyLabel="!" latin:moreKeys="!text/more_keys_for_symbols_exclamation" /> + <Key + latin:keyLabel="!text/keylabel_for_symbols_question" + latin:moreKeys="!text/more_keys_for_symbols_question" /> <switch> <case latin:languageCode="fa" @@ -33,11 +36,11 @@ <Key latin:keyLabel="«" latin:code="0x00BB" - latin:moreKeys="!text/more_keys_for_double_quote" /> + latin:moreKeys="!fixedColumnOrder!6,!text/more_keys_for_double_quote,"" /> <Key latin:keyLabel="»" latin:code="0x00AB" - latin:moreKeys="!text/more_keys_for_single_quote" /> + latin:moreKeys="!fixedColumnOrder!6,!text/more_keys_for_single_quote,\'" /> </case> <default> <Key @@ -48,14 +51,18 @@ latin:moreKeys="!text/more_keys_for_single_quote" /> </default> </switch> + <!-- U+2013: "–" EN DASH + U+2014: "—" EM DASH + U+00B7: "·" MIDDLE DOT --> + <Key + latin:keyLabel="-" + latin:moreKeys="_,~,–,—,·" /> <Key latin:keyLabel=":" /> <Key latin:keyLabel="!text/keylabel_for_symbols_semicolon" latin:moreKeys="!text/more_keys_for_symbols_semicolon" /> <Key - latin:keyLabel="/" /> - <Key - latin:keyLabel="!text/keylabel_for_symbols_question" - latin:moreKeys="!text/more_keys_for_symbols_question" /> + latin:keyLabel="/" + latin:moreKeys="\\|,\\\\,^" /> </merge> diff --git a/java/res/xml/rowkeys_symbols_shift1.xml b/java/res/xml/rowkeys_symbols_shift1.xml deleted file mode 100644 index fea8ae337..000000000 --- a/java/res/xml/rowkeys_symbols_shift1.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <Key - latin:keyLabel="~" /> - <Key - latin:keyLabel="`" /> - <Key - latin:keyLabel="|" /> - <!-- U+2022: "•" BULLET --> - <Key - latin:keyLabel="•" - latin:moreKeys="!text/more_keys_for_bullet" /> - <!-- U+221A: "√" SQUARE ROOT --> - <Key - latin:keyLabel="√" /> - <!-- U+03C0: "π" GREEK SMALL LETTER PI - U+03A0: "Π" GREEK CAPITAL LETTER PI --> - <Key - latin:keyLabel="π" - latin:moreKeys="Π" /> - <!-- U+00F7: "÷" DIVISION SIGN --> - <Key - latin:keyLabel="÷" /> - <!-- U+00D7: "×" MULTIPLICATION SIGN --> - <Key - latin:keyLabel="×" /> - <include - latin:keyboardLayout="@xml/keys_curly_brackets" /> -</merge> diff --git a/java/res/xml/rowkeys_symbols_shift2.xml b/java/res/xml/rowkeys_symbols_shift2.xml deleted file mode 100644 index 3fd8aacb6..000000000 --- a/java/res/xml/rowkeys_symbols_shift2.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <Key - latin:keyStyle="nonSpecialBackgroundTabKeyStyle" /> - <Key - latin:keyStyle="moreCurrency1KeyStyle" /> - <Key - latin:keyStyle="moreCurrency2KeyStyle" /> - <Key - latin:keyStyle="moreCurrency3KeyStyle" /> - <!-- U+00B0: "°" DEGREE SIGN - U+2032: "′" PRIME - U+2033: "″" DOUBLE PRIME --> - <Key - latin:keyLabel="°" - latin:moreKeys="′,″" /> - <!-- U+2191: "↑" UPWARDS ARROW - U+2193: "↓" DOWNWARDS ARROW - U+2190: "←" LEFTWARDS ARROW - U+2192: "→" RIGHTWARDS ARROW --> - <Key - latin:keyLabel="^" - latin:moreKeys="↑,↓,←,→" /> - <Key - latin:keyLabel="_" /> - <!-- U+2260: "≠" NOT EQUAL TO - U+2248: "≈" ALMOST EQUAL TO - U+221E: "∞" INFINITY --> - <Key - latin:keyLabel="=" - latin:moreKeys="≠,≈,∞" /> - <include - latin:keyboardLayout="@xml/keys_square_brackets" /> -</merge> diff --git a/java/res/xml/rowkeys_symbols_shift3.xml b/java/res/xml/rowkeys_symbols_shift3.xml deleted file mode 100644 index a35af218f..000000000 --- a/java/res/xml/rowkeys_symbols_shift3.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <!-- U+2122: "™" TRADE MARK SIGN --> - <Key - latin:keyLabel="™" /> - <!-- U+00AE: "®" REGISTERED SIGN --> - <Key - latin:keyLabel="®" /> - <!-- U+00A9: "©" COPYRIGHT SIGN --> - <Key - latin:keyLabel="©" /> - <!-- U+00B6: "¶" PILCROW SIGN - U+00A7: "§" SECTION SIGN --> - <Key - latin:keyLabel="¶" - latin:moreKeys="§" /> - <Key - latin:keyLabel="\\" /> - <include - latin:keyboardLayout="@xml/keys_less_greater" /> -</merge> diff --git a/java/res/xml/rows_pcqwerty.xml b/java/res/xml/rows_pcqwerty.xml index a5ed74518..884698963 100644 --- a/java/res/xml/rows_pcqwerty.xml +++ b/java/res/xml/rows_pcqwerty.xml @@ -26,8 +26,19 @@ <Row latin:keyWidth="7.692%p" > - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> + <switch> + <case + latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" + > + <include + latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> + </case> + <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> + <default> + <include + latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" /> + </default> + </switch> </Row> <Row latin:keyWidth="7.692%p" diff --git a/java/res/xml/rows_pcqwerty_symbols.xml b/java/res/xml/rows_pcqwerty_symbols.xml deleted file mode 100644 index 107a4ad1f..000000000 --- a/java/res/xml/rows_pcqwerty_symbols.xml +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> - <Row - latin:keyWidth="7.692%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> - </Row> - <Row - latin:keyWidth="7.692%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty2" /> - </Row> - <Row - latin:keyWidth="7.692%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty3" - latin:keyXPos="3.846%p" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" - latin:visualInsetsLeft="1%p" /> - </Row> - <Row - latin:keyWidth="7.692%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty4" - latin:keyXPos="11.538%p" /> - </Row> - <include - latin:keyboardLayout="@xml/row_pcqwerty5" /> -</merge> diff --git a/java/res/xml/rows_symbols.xml b/java/res/xml/rows_symbols.xml index bd1a57e75..27010cbd6 100644 --- a/java/res/xml/rows_symbols.xml +++ b/java/res/xml/rows_symbols.xml @@ -23,8 +23,6 @@ > <include latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> <Row latin:keyWidth="10%p" > @@ -40,11 +38,8 @@ <Row latin:keyWidth="10%p" > - <Key - latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyWidth="15%p" - latin:visualInsetsRight="1%p" /> <include + latin:keyXPos="5%p" latin:keyboardLayout="@xml/rowkeys_symbols3" /> <Key latin:keyStyle="deleteKeyStyle" diff --git a/java/res/xml/rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml deleted file mode 100644 index 9c03d90b5..000000000 --- a/java/res/xml/rows_symbols_shift.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2008, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> - <Row - latin:keyWidth="10%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift1" /> - </Row> - <Row - latin:keyWidth="10%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift2" /> - </Row> - <Row - latin:keyWidth="10%p" - > - <Key - latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyWidth="15%p" - latin:visualInsetsRight="1%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift3" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" - latin:visualInsetsLeft="1%p" /> - </Row> - <include - latin:keyboardLayout="@xml/row_symbols_shift4" /> -</merge> |
