diff options
Diffstat (limited to 'java')
68 files changed, 28 insertions, 339 deletions
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lmp.9.png Binary files differdeleted file mode 100644 index 814e40235..000000000 --- a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_lmp.9.png Binary files differdeleted file mode 100644 index 90abe3940..000000000 --- a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png Binary files differdeleted file mode 100644 index 48eeb3f54..000000000 --- a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png Binary files differdeleted file mode 100644 index 71e0683cd..000000000 --- a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_lmp.9.png Binary files differdeleted file mode 100644 index 6768241a7..000000000 --- a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lmp.9.png Binary files differdeleted file mode 100644 index 10f8e97e4..000000000 --- a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_lmp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_lmp.9.png Binary files differdeleted file mode 100644 index be394151a..000000000 --- a/java/res/drawable-hdpi/keyboard_key_feedback_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_background_lmp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_background_lmp.9.png Binary files differdeleted file mode 100644 index 9fa6d0003..000000000 --- a/java/res/drawable-hdpi/keyboard_key_feedback_left_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_lmp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_lmp.9.png Binary files differdeleted file mode 100644 index c73269b7e..000000000 --- a/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lmp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lmp.9.png Binary files differdeleted file mode 100644 index fffd4021e..000000000 --- a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_background_lmp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_background_lmp.9.png Binary files differdeleted file mode 100644 index 61c23c19b..000000000 --- a/java/res/drawable-hdpi/keyboard_key_feedback_right_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_lmp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_lmp.9.png Binary files differdeleted file mode 100644 index 827d74363..000000000 --- a/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background_lmp.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background_lmp.9.png Binary files differdeleted file mode 100644 index f9dd3b8b1..000000000 --- a/java/res/drawable-hdpi/keyboard_popup_panel_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lmp.9.png Binary files differdeleted file mode 100644 index b7b2dca43..000000000 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_lmp.9.png Binary files differdeleted file mode 100644 index 4a92b80dd..000000000 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png Binary files differdeleted file mode 100644 index 72125a065..000000000 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png Binary files differdeleted file mode 100644 index 82413d4cc..000000000 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_lmp.9.png Binary files differdeleted file mode 100644 index 049385984..000000000 --- a/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lmp.9.png Binary files differdeleted file mode 100644 index ee0aae28b..000000000 --- a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_lmp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_lmp.9.png Binary files differdeleted file mode 100644 index 625490b1f..000000000 --- a/java/res/drawable-mdpi/keyboard_key_feedback_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_background_lmp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_background_lmp.9.png Binary files differdeleted file mode 100644 index 427c87061..000000000 --- a/java/res/drawable-mdpi/keyboard_key_feedback_left_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_lmp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_lmp.9.png Binary files differdeleted file mode 100644 index ea757296d..000000000 --- a/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lmp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lmp.9.png Binary files differdeleted file mode 100644 index 1911c429f..000000000 --- a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_background_lmp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_background_lmp.9.png Binary files differdeleted file mode 100644 index cdef116d2..000000000 --- a/java/res/drawable-mdpi/keyboard_key_feedback_right_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_lmp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_lmp.9.png Binary files differdeleted file mode 100644 index dea5d076c..000000000 --- a/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background_lmp.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_lmp.9.png Binary files differdeleted file mode 100644 index 896505518..000000000 --- a/java/res/drawable-mdpi/keyboard_popup_panel_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png Binary files differdeleted file mode 100644 index 20251a000..000000000 --- a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_lmp.9.png Binary files differdeleted file mode 100644 index 84d173967..000000000 --- a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png Binary files differdeleted file mode 100644 index ee4490eac..000000000 --- a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png Binary files differdeleted file mode 100644 index e8124776c..000000000 --- a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_lmp.9.png Binary files differdeleted file mode 100644 index f770962c3..000000000 --- a/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lmp.9.png Binary files differdeleted file mode 100644 index 891d00024..000000000 --- a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lmp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lmp.9.png Binary files differdeleted file mode 100644 index c211d89c8..000000000 --- a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_lmp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_lmp.9.png Binary files differdeleted file mode 100644 index 543bc763e..000000000 --- a/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_lmp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_lmp.9.png Binary files differdeleted file mode 100644 index ec42aadb6..000000000 --- a/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lmp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lmp.9.png Binary files differdeleted file mode 100644 index 319e9d7cf..000000000 --- a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_lmp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_lmp.9.png Binary files differdeleted file mode 100644 index 052032be7..000000000 --- a/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_lmp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_lmp.9.png Binary files differdeleted file mode 100644 index c7e9d1c9e..000000000 --- a/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/keyboard_popup_panel_background_lmp.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background_lmp.9.png Binary files differdeleted file mode 100644 index 36df715b6..000000000 --- a/java/res/drawable-xhdpi/keyboard_popup_panel_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png Binary files differdeleted file mode 100644 index 97f96258e..000000000 --- a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_lmp.9.png Binary files differdeleted file mode 100644 index dfb16a76b..000000000 --- a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png Binary files differdeleted file mode 100644 index bf1d34686..000000000 --- a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png Binary files differdeleted file mode 100644 index 962277165..000000000 --- a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_lmp.9.png Binary files differdeleted file mode 100644 index 17144b673..000000000 --- a/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lmp.9.png Binary files differdeleted file mode 100644 index 0cbb2ec84..000000000 --- a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lmp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lmp.9.png Binary files differdeleted file mode 100644 index fd2f9e514..000000000 --- a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_lmp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_lmp.9.png Binary files differdeleted file mode 100644 index 3ab79007e..000000000 --- a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_lmp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_lmp.9.png Binary files differdeleted file mode 100644 index 99543a1e0..000000000 --- a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lmp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lmp.9.png Binary files differdeleted file mode 100644 index 121411a06..000000000 --- a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_lmp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_lmp.9.png Binary files differdeleted file mode 100644 index e9e379287..000000000 --- a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_lmp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_lmp.9.png Binary files differdeleted file mode 100644 index 6c1143aeb..000000000 --- a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lmp.9.png b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lmp.9.png Binary files differdeleted file mode 100644 index 91d5d7f90..000000000 --- a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lmp.9.png +++ /dev/null diff --git a/java/res/drawable/btn_keyboard_key_functional_lmp.xml b/java/res/drawable/btn_keyboard_key_functional_lmp.xml deleted file mode 100644 index 427b8d568..000000000 --- a/java/res/drawable/btn_keyboard_key_functional_lmp.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 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_pressed="true" - android:drawable="@drawable/btn_keyboard_key_dark_pressed_lmp" /> - <item android:drawable="@android:color/transparent" /> -</selector> diff --git a/java/res/drawable/btn_keyboard_key_ics.xml b/java/res/drawable/btn_keyboard_key_ics.xml index 9db0eeef4..259bb9ba5 100644 --- a/java/res/drawable/btn_keyboard_key_ics.xml +++ b/java/res/drawable/btn_keyboard_key_ics.xml @@ -39,7 +39,7 @@ <!-- Empty background keys. --> <item android:state_empty="true" - android:drawable="@android:color/transparent" /> + android:drawable="@drawable/transparent" /> <!-- Normal keys. --> <item android:state_pressed="true" diff --git a/java/res/drawable/btn_keyboard_key_klp.xml b/java/res/drawable/btn_keyboard_key_klp.xml index 500e3ea75..16b5fa00b 100644 --- a/java/res/drawable/btn_keyboard_key_klp.xml +++ b/java/res/drawable/btn_keyboard_key_klp.xml @@ -39,7 +39,7 @@ <!-- Empty background keys. --> <item android:state_empty="true" - android:drawable="@android:color/transparent" /> + android:drawable="@drawable/transparent" /> <!-- Normal keys. --> <item android:state_pressed="true" diff --git a/java/res/drawable/btn_keyboard_key_lmp.xml b/java/res/drawable/btn_keyboard_key_lmp.xml deleted file mode 100644 index fdd19df68..000000000 --- a/java/res/drawable/btn_keyboard_key_lmp.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 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_dark_pressed_lmp" /> - <item android:state_single="true" - android:drawable="@android:color/transparent" /> - - <!-- Action keys. --> - <item android:state_active="true" android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_dark_pressed_lmp" /> - <item android:state_active="true" - android:drawable="@android:color/transparent" /> - - <!-- Toggle keys. Use checkable/checked state. --> - <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_dark_pressed_on_lmp" /> - <item android:state_checkable="true" android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_dark_pressed_lmp" /> - <item android:state_checkable="true" android:state_checked="true" - android:drawable="@drawable/btn_keyboard_key_dark_normal_on_lmp" /> - <item android:state_checkable="true" - android:drawable="@android:color/transparent" /> - - <!-- Empty background keys. --> - <item android:state_empty="true" - android:drawable="@android:color/transparent" /> - - <!-- Normal keys. --> - <item android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_light_pressed_lmp" /> - <item android:drawable="@android:color/transparent" /> -</selector> diff --git a/java/res/drawable/btn_keyboard_key_popup_ics.xml b/java/res/drawable/btn_keyboard_key_popup_ics.xml index 17d646b8f..31b613176 100644 --- a/java/res/drawable/btn_keyboard_key_popup_ics.xml +++ b/java/res/drawable/btn_keyboard_key_popup_ics.xml @@ -17,5 +17,5 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" android:drawable="@drawable/btn_keyboard_key_popup_selected_ics" /> - <item android:drawable="@android:color/transparent" /> + <item android:drawable="@drawable/transparent" /> </selector> diff --git a/java/res/drawable/btn_keyboard_key_popup_klp.xml b/java/res/drawable/btn_keyboard_key_popup_klp.xml index 9dfc93ae8..62cbca8ae 100644 --- a/java/res/drawable/btn_keyboard_key_popup_klp.xml +++ b/java/res/drawable/btn_keyboard_key_popup_klp.xml @@ -17,5 +17,5 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" android:drawable="@drawable/btn_keyboard_key_popup_selected_klp" /> - <item android:drawable="@android:color/transparent" /> + <item android:drawable="@drawable/transparent" /> </selector> diff --git a/java/res/drawable/btn_keyboard_key_popup_lmp.xml b/java/res/drawable/btn_keyboard_key_popup_lmp.xml deleted file mode 100644 index ebedaea3a..000000000 --- a/java/res/drawable/btn_keyboard_key_popup_lmp.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 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"> - <item android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_popup_selected_lmp" /> - <item android:drawable="@android:color/transparent" /> -</selector> diff --git a/java/res/drawable/btn_keyboard_spacebar_lmp.xml b/java/res/drawable/btn_keyboard_spacebar_lmp.xml deleted file mode 100644 index 516cb0731..000000000 --- a/java/res/drawable/btn_keyboard_spacebar_lmp.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 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"> - <item android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_light_pressed_lmp" /> - <item android:drawable="@android:color/transparent" /> -</selector> diff --git a/java/res/drawable/keyboard_key_feedback_lmp.xml b/java/res/drawable/keyboard_key_feedback_lmp.xml deleted file mode 100644 index cdbe64c38..000000000 --- a/java/res/drawable/keyboard_key_feedback_lmp.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 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" - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <!-- Left edge --> - <item latin:state_left_edge="true" latin:state_has_morekeys="true" - android:drawable="@drawable/keyboard_key_feedback_left_more_background_lmp" /> - <item latin:state_left_edge="true" - android:drawable="@drawable/keyboard_key_feedback_left_background_lmp" /> - - <!-- Right edge --> - <item latin:state_right_edge="true" latin:state_has_morekeys="true" - android:drawable="@drawable/keyboard_key_feedback_right_more_background_lmp" /> - <item latin:state_right_edge="true" - android:drawable="@drawable/keyboard_key_feedback_right_background_lmp" /> - - <item latin:state_has_morekeys="true" - android:drawable="@drawable/keyboard_key_feedback_more_background_lmp" /> - <item android:drawable="@drawable/keyboard_key_feedback_background_lmp" /> -</selector> diff --git a/java/res/drawable/btn_suggestion_lmp.xml b/java/res/drawable/transparent.xml index c778e236f..855cf2ad5 100644 --- a/java/res/drawable/btn_suggestion_lmp.xml +++ b/java/res/drawable/transparent.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2014, The Android Open Source Project +** 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. @@ -18,10 +18,13 @@ */ --> -<selector +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle" > - <item - android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_popup_selected_lmp" /> -</selector> + <solid + android:color="@android:color/transparent" /> + <size + android:width="50dp" + android:height="40dp" /> +</shape> diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml index dabb4d65e..824928c6b 100644 --- a/java/res/values/colors.xml +++ b/java/res/values/colors.xml @@ -40,12 +40,6 @@ <color name="typed_word_color_klp">#D8F0F0F0</color> <color name="suggested_word_color_klp">#B2F0F0F0</color> <color name="highlight_translucent_color_klp">#99E0E0E0</color> - <!-- Color resources for LMP theme. Base color = F0F0F0 --> - <color name="key_hint_letter_color_lmp">@android:color/white</color> - <color name="highlight_color_lmp">#FFF0F0F0</color> - <color name="typed_word_color_lmp">#D8F0F0F0</color> - <color name="suggested_word_color_lmp">#B2F0F0F0</color> - <color name="highlight_translucent_color_lmp">#99E0E0E0</color> <!-- Color 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/donottranslate.xml b/java/res/values/donottranslate.xml index 415dd0b65..9a610a0d0 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -47,6 +47,17 @@ <string name="prefs_debug_mode">Debug Mode</string> <string name="prefs_force_non_distinct_multitouch">Force non-distinct multitouch</string> + <!-- For keyboard color scheme option dialog. --> + <string-array name="keyboard_theme_names"> + <item>@string/keyboard_color_scheme_white</item> + <item>@string/keyboard_color_scheme_blue</item> + </string-array> + <!-- An element must be a keyboard theme id of {@link KeyboardTheme#THEME_ID_*}. --> + <string-array name="keyboard_theme_ids"> + <item>2</item> + <item>0</item> + </string-array> + <!-- Subtype locale display name exceptions. For each exception, there should be related string resources for display name that may have explicit keyboard layout. The string resource name must be "subtype_<locale>" or diff --git a/java/res/values/keyboard-icons-holo.xml b/java/res/values/keyboard-icons-holo.xml index 669d2c07d..4c888d570 100644 --- a/java/res/values/keyboard-icons-holo.xml +++ b/java/res/values/keyboard-icons-holo.xml @@ -21,6 +21,9 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="KeyboardIcons.Holo"> <!-- 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_dark</item> <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo_dark</item> <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo_dark</item> diff --git a/java/res/values/keyboard-icons-lmp.xml b/java/res/values/keyboard-icons-lmp.xml deleted file mode 100644 index a9cbabca6..000000000 --- a/java/res/values/keyboard-icons-lmp.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2014, 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.LMP"> - <!-- Keyboard icons --> - <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo_dark</item> - <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo_dark</item> - <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo_dark</item> - <item name="iconSpaceKey">@drawable/sym_keyboard_space_holo_dark</item> - <item name="iconEnterKey">@drawable/sym_keyboard_return_holo_dark</item> - <item name="iconSearchKey">@drawable/sym_keyboard_search_holo_dark</item> - <item name="iconTabKey">@drawable/sym_keyboard_tab_holo_dark</item> - <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo_dark</item> - <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo_dark</item> - <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_holo_dark</item> - <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_holo_dark</item> - <item name="iconTabKeyPreview">@drawable/sym_keyboard_feedback_tab</item> - <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch_dark</item> - <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo_dark</item> - <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo_dark</item> - <item name="iconEmojiKey">@drawable/sym_keyboard_smiley_holo_dark</item> - </style> -</resources> diff --git a/java/res/values/themes-lmp.xml b/java/res/values/themes-lmp.xml deleted file mode 100644 index 773da196d..000000000 --- a/java/res/values/themes-lmp.xml +++ /dev/null @@ -1,133 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2014, 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="KeyboardTheme.LMP" parent="KeyboardIcons.LMP"> - <item name="keyboardStyle">@style/Keyboard.LMP</item> - <item name="keyboardViewStyle">@style/KeyboardView.LMP</item> - <item name="mainKeyboardViewStyle">@style/MainKeyboardView.LMP</item> - <item name="keyPreviewTextViewStyle">@style/KeyPreviewTextView.LMP</item> - <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.LMP</item> - <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.LMP</item> - <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.LMP</item> - <item name="suggestionStripViewStyle">@style/SuggestionStripView.LMP</item> - <item name="suggestionWordStyle">@style/SuggestionWord.LMP</item> - </style> - <style - name="Keyboard.LMP" - parent="Keyboard" - > - <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> - <item name="themeId">0</item> - <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item> - <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item> - <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item> - <item name="verticalGap">@fraction/config_key_vertical_gap_holo</item> - <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item> - </style> - <style - name="KeyboardView.LMP" - parent="KeyboardView" - > - <item name="android:background">@drawable/keyboard_background_holo</item> - <item name="keyBackground">@drawable/btn_keyboard_key_lmp</item> - <item name="keyTypeface">bold</item> - <item name="keyTextColor">@color/key_text_color_holo</item> - <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_holo</item> - <item name="keyHintLetterColor">@color/key_hint_letter_color_lmp</item> - <item name="keyHintLabelColor">@color/key_hint_label_color_holo</item> - <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_holo</item> - <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_holo</item> - <item name="keyPreviewTextColor">@color/key_text_color_holo</item> - <item name="keyTextShadowColor">@color/key_text_shadow_color_holo</item> - <item name="keyTextShadowRadius">0.0</item> - </style> - <style - name="MainKeyboardView.LMP" - parent="KeyboardView.LMP" - > - <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item> - <item name="gestureFloatingPreviewTextColor">@color/highlight_color_lmp</item> - <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item> - <item name="gestureTrailColor">@color/highlight_color_lmp</item> - <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_lmp</item> - <item name="autoCorrectionSpacebarLedEnabled">false</item> - <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item> - <item name="languageOnSpacebarTextColor">@color/spacebar_text_color_holo</item> - <item name="languageOnSpacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item> - <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lmp</item> - </style> - <style - name="KeyPreviewTextView.LMP" - parent="KeyPreviewTextView" - > - <item name="android:background">@drawable/keyboard_key_feedback_lmp</item> - </style> - <!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it, - for instance delete button, need themed {@link KeyboardView} attributes. --> - <style - name="EmojiPalettesView.LMP" - parent="KeyboardView.LMP" - > - <item name="keyBackgroundEmojiFunctional">@drawable/btn_keyboard_key_functional_lmp</item> - <item name="emojiTabLabelColor">@color/emoji_tab_label_color_holo</item> - </style> - <style - name="MoreKeysKeyboard.LMP" - parent="Keyboard.LMP" - > - <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.LMP" - parent="KeyboardView.LMP" - > - <item name="android:background">@drawable/keyboard_popup_panel_background_lmp</item> - <item name="keyBackground">@drawable/btn_keyboard_key_popup_lmp</item> - <item name="keyTypeface">normal</item> - <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item> - </style> - <style - name="SuggestionStripView.LMP" - parent="KeyboardView.LMP" - > - <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item> - <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item> - <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item> - <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item> - <item name="android:background">@drawable/keyboard_suggest_strip_holo</item> - <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item> - <item name="colorValidTypedWord">@color/typed_word_color_lmp</item> - <item name="colorTypedWord">@color/typed_word_color_lmp</item> - <item name="colorAutoCorrect">@color/highlight_color_lmp</item> - <item name="colorSuggested">@color/suggested_word_color_lmp</item> - <item name="alphaObsoleted">70%</item> - </style> - <style - name="SuggestionWord.LMP" - parent="SuggestionWord" - > - <item name="android:background">@drawable/btn_suggestion_lmp</item> - <item name="android:textColor">@color/highlight_color_lmp</item> - </style> -</resources> diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index 773995fa8..78e030132 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -87,7 +87,7 @@ latin:keyboardLayout="@xml/key_styles_enter" /> <key-style latin:styleName="spaceKeyStyle" - latin:keySpec="!icon/space_key|!code/key_space" + latin:keySpec=" |!code/key_space" latin:keyActionFlags="noKeyPreview|enableLongPress" /> <!-- U+200C: ZERO WIDTH NON-JOINER U+200D: ZERO WIDTH JOINER --> |
