diff options
Diffstat (limited to '')
91 files changed, 261 insertions, 517 deletions
diff --git a/java/res/drawable-hdpi/caution.png b/java/res/drawable-hdpi/caution.png Binary files differdeleted file mode 100644 index 61eb4dd62..000000000 --- a/java/res/drawable-hdpi/caution.png +++ /dev/null diff --git a/java/res/drawable-hdpi/ic_mic_dialog.png b/java/res/drawable-hdpi/ic_mic_dialog.png Binary files differdeleted file mode 100644 index 6107f876e..000000000 --- a/java/res/drawable-hdpi/ic_mic_dialog.png +++ /dev/null diff --git a/java/res/drawable-hdpi/ic_suggest_strip_microphone.png b/java/res/drawable-hdpi/ic_suggest_strip_microphone.png Binary files differdeleted file mode 100644 index 189a861fb..000000000 --- a/java/res/drawable-hdpi/ic_suggest_strip_microphone.png +++ /dev/null diff --git a/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png b/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png Binary files differdeleted file mode 100644 index b4a6e373b..000000000 --- a/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png +++ /dev/null diff --git a/java/res/drawable-hdpi/mic_base.png b/java/res/drawable-hdpi/mic_base.png Binary files differdeleted file mode 100644 index 504a1aa2a..000000000 --- a/java/res/drawable-hdpi/mic_base.png +++ /dev/null diff --git a/java/res/drawable-hdpi/mic_full.png b/java/res/drawable-hdpi/mic_full.png Binary files differdeleted file mode 100644 index 3f4a67657..000000000 --- a/java/res/drawable-hdpi/mic_full.png +++ /dev/null diff --git a/java/res/drawable-hdpi/mic_slash.png b/java/res/drawable-hdpi/mic_slash.png Binary files differdeleted file mode 100644 index c3b10929b..000000000 --- a/java/res/drawable-hdpi/mic_slash.png +++ /dev/null diff --git a/java/res/drawable-hdpi/vs_dialog_blue.9.png b/java/res/drawable-hdpi/vs_dialog_blue.9.png Binary files differdeleted file mode 100644 index 4f813ead3..000000000 --- a/java/res/drawable-hdpi/vs_dialog_blue.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/vs_dialog_red.9.png b/java/res/drawable-hdpi/vs_dialog_red.9.png Binary files differdeleted file mode 100644 index a2055600e..000000000 --- a/java/res/drawable-hdpi/vs_dialog_red.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/vs_dialog_yellow.9.png b/java/res/drawable-hdpi/vs_dialog_yellow.9.png Binary files differdeleted file mode 100644 index ce664b676..000000000 --- a/java/res/drawable-hdpi/vs_dialog_yellow.9.png +++ /dev/null diff --git a/java/res/drawable-hdpi/vs_popup_mic_edge.png b/java/res/drawable-hdpi/vs_popup_mic_edge.png Binary files differdeleted file mode 100644 index 4ff6337a2..000000000 --- a/java/res/drawable-hdpi/vs_popup_mic_edge.png +++ /dev/null diff --git a/java/res/drawable-mdpi/caution.png b/java/res/drawable-mdpi/caution.png Binary files differdeleted file mode 100644 index eaef53425..000000000 --- a/java/res/drawable-mdpi/caution.png +++ /dev/null diff --git a/java/res/drawable-mdpi/ic_mic_dialog.png b/java/res/drawable-mdpi/ic_mic_dialog.png Binary files differdeleted file mode 100644 index 77613ca05..000000000 --- a/java/res/drawable-mdpi/ic_mic_dialog.png +++ /dev/null diff --git a/java/res/drawable-mdpi/ic_suggest_strip_microphone.png b/java/res/drawable-mdpi/ic_suggest_strip_microphone.png Binary files differdeleted file mode 100644 index 18f314a61..000000000 --- a/java/res/drawable-mdpi/ic_suggest_strip_microphone.png +++ /dev/null diff --git a/java/res/drawable-mdpi/ic_suggest_strip_microphone_swipe.png b/java/res/drawable-mdpi/ic_suggest_strip_microphone_swipe.png Binary files differdeleted file mode 100644 index ff629b674..000000000 --- a/java/res/drawable-mdpi/ic_suggest_strip_microphone_swipe.png +++ /dev/null diff --git a/java/res/drawable-mdpi/mic_base.png b/java/res/drawable-mdpi/mic_base.png Binary files differdeleted file mode 100644 index 53e29ff4b..000000000 --- a/java/res/drawable-mdpi/mic_base.png +++ /dev/null diff --git a/java/res/drawable-mdpi/mic_full.png b/java/res/drawable-mdpi/mic_full.png Binary files differdeleted file mode 100644 index e3e3dfac3..000000000 --- a/java/res/drawable-mdpi/mic_full.png +++ /dev/null diff --git a/java/res/drawable-mdpi/mic_slash.png b/java/res/drawable-mdpi/mic_slash.png Binary files differdeleted file mode 100644 index d04b56344..000000000 --- a/java/res/drawable-mdpi/mic_slash.png +++ /dev/null diff --git a/java/res/drawable-mdpi/vs_dialog_blue.9.png b/java/res/drawable-mdpi/vs_dialog_blue.9.png Binary files differdeleted file mode 100644 index cf27e8f43..000000000 --- a/java/res/drawable-mdpi/vs_dialog_blue.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/vs_dialog_red.9.png b/java/res/drawable-mdpi/vs_dialog_red.9.png Binary files differdeleted file mode 100644 index 6c08d5a30..000000000 --- a/java/res/drawable-mdpi/vs_dialog_red.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/vs_dialog_yellow.9.png b/java/res/drawable-mdpi/vs_dialog_yellow.9.png Binary files differdeleted file mode 100644 index 2fb06c263..000000000 --- a/java/res/drawable-mdpi/vs_dialog_yellow.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/vs_popup_mic_edge.png b/java/res/drawable-mdpi/vs_popup_mic_edge.png Binary files differdeleted file mode 100644 index 4ff6337a2..000000000 --- a/java/res/drawable-mdpi/vs_popup_mic_edge.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/caution.png b/java/res/drawable-xhdpi/caution.png Binary files differdeleted file mode 100644 index cfc3f7547..000000000 --- a/java/res/drawable-xhdpi/caution.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/ic_mic_dialog.png b/java/res/drawable-xhdpi/ic_mic_dialog.png Binary files differdeleted file mode 100644 index 5d6399c0a..000000000 --- a/java/res/drawable-xhdpi/ic_mic_dialog.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/ic_suggest_strip_microphone.png b/java/res/drawable-xhdpi/ic_suggest_strip_microphone.png Binary files differdeleted file mode 100644 index d65d28708..000000000 --- a/java/res/drawable-xhdpi/ic_suggest_strip_microphone.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/ic_suggest_strip_microphone_swipe.png b/java/res/drawable-xhdpi/ic_suggest_strip_microphone_swipe.png Binary files differdeleted file mode 100644 index 889378a6a..000000000 --- a/java/res/drawable-xhdpi/ic_suggest_strip_microphone_swipe.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/mic_base.png b/java/res/drawable-xhdpi/mic_base.png Binary files differdeleted file mode 100644 index 5c060bec9..000000000 --- a/java/res/drawable-xhdpi/mic_base.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/mic_full.png b/java/res/drawable-xhdpi/mic_full.png Binary files differdeleted file mode 100644 index 32ffe124e..000000000 --- a/java/res/drawable-xhdpi/mic_full.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/mic_slash.png b/java/res/drawable-xhdpi/mic_slash.png Binary files differdeleted file mode 100644 index 18b22542b..000000000 --- a/java/res/drawable-xhdpi/mic_slash.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/vs_dialog_blue.9.png b/java/res/drawable-xhdpi/vs_dialog_blue.9.png Binary files differdeleted file mode 100644 index 3284d78ef..000000000 --- a/java/res/drawable-xhdpi/vs_dialog_blue.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/vs_dialog_red.9.png b/java/res/drawable-xhdpi/vs_dialog_red.9.png Binary files differdeleted file mode 100644 index 5af2465b5..000000000 --- a/java/res/drawable-xhdpi/vs_dialog_red.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/vs_dialog_yellow.9.png b/java/res/drawable-xhdpi/vs_dialog_yellow.9.png Binary files differdeleted file mode 100644 index 4f50439de..000000000 --- a/java/res/drawable-xhdpi/vs_dialog_yellow.9.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/vs_popup_mic_edge.png b/java/res/drawable-xhdpi/vs_popup_mic_edge.png Binary files differdeleted file mode 100644 index 1063cb464..000000000 --- a/java/res/drawable-xhdpi/vs_popup_mic_edge.png +++ /dev/null diff --git a/java/res/drawable/background_voice.xml b/java/res/drawable/background_voice.xml deleted file mode 100644 index 49a419110..000000000 --- a/java/res/drawable/background_voice.xml +++ /dev/null @@ -1,25 +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. -*/ ---> -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <gradient - android:startColor="#ff000000" - android:endColor="#ff000e29" - android:angle="90" /> -</shape> diff --git a/java/res/layout-sw768dp/recognition_status.xml b/java/res/layout-sw768dp/recognition_status.xml deleted file mode 100644 index d476651c6..000000000 --- a/java/res/layout-sw768dp/recognition_status.xml +++ /dev/null @@ -1,101 +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. -*/ ---> -<RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:background="@drawable/background_voice"> - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/popup_layout" - android:orientation="vertical" - android:layout_height="371dp" - android:layout_width="500dp" - android:layout_centerInParent="true" - android:background="@drawable/vs_dialog_red"> - <TextView - android:id="@+id/text" - android:text="@string/voice_error" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:singleLine="true" - android:layout_marginTop="10dp" - android:textSize="28sp" - android:textColor="#ffffff" - android:layout_gravity="center" - android:visibility="invisible"/> - <RelativeLayout - android:layout_height="0dp" - android:layout_width="match_parent" - android:layout_weight="1.0"> - <com.android.inputmethod.deprecated.voice.SoundIndicator - android:id="@+id/sound_indicator" - android:src="@drawable/mic_full" - android:background="@drawable/mic_base" - android:adjustViewBounds="true" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_centerInParent="true" - android:visibility="gone"/> - <ImageView - android:id="@+id/image" - android:src="@drawable/mic_slash" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_centerInParent="true" - android:visibility="visible"/> - <ProgressBar - android:id="@+id/progress" - android:indeterminate="true" - android:indeterminateOnly="false" - android:layout_height="60dp" - android:layout_width="60dp" - android:layout_centerInParent="true" - android:visibility="gone"/> - </RelativeLayout> - <!-- - The text is set by the code. We specify a random text (voice_error), so the - text view does not have a zero height. This is necessary to keep the slash - mic and the recording mic is the same position - --> - <TextView - android:id="@+id/language" - android:text="@string/voice_error" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:singleLine="true" - android:textSize="14sp" - android:layout_marginBottom="3dp" - android:layout_gravity="center" - android:textColor="#ffffff" - android:visibility="invisible"/> - <Button - android:id="@+id/button" - android:layout_width="match_parent" - android:layout_height="54dp" - android:singleLine="true" - android:focusable="true" - android:text="@string/cancel" - android:layout_gravity="center_horizontal" - android:background="@drawable/btn_center" - android:textColor="#ffffff" - android:textSize="19sp" /> - </LinearLayout> -</RelativeLayout> diff --git a/java/res/layout/recognition_status.xml b/java/res/layout/recognition_status.xml deleted file mode 100644 index 578788831..000000000 --- a/java/res/layout/recognition_status.xml +++ /dev/null @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2009, 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. -*/ ---> -<RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:background="@drawable/background_voice"> - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/popup_layout" - android:orientation="vertical" - android:layout_height="371dp" - android:layout_width="500dp" - android:layout_centerInParent="true" - android:background="@drawable/vs_dialog_red"> - <TextView - android:id="@+id/text" - android:text="@string/voice_error" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:singleLine="true" - android:layout_marginTop="10dp" - android:textSize="20sp" - android:textColor="#ffffff" - android:layout_gravity="center" - android:visibility="invisible"/> - <RelativeLayout - android:layout_height="0dp" - android:layout_width="match_parent" - android:layout_weight="1.0"> - <com.android.inputmethod.deprecated.voice.SoundIndicator - android:id="@+id/sound_indicator" - android:src="@drawable/mic_full" - android:background="@drawable/mic_base" - android:adjustViewBounds="true" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_centerInParent="true" - android:visibility="gone"/> - <ImageView - android:id="@+id/image" - android:src="@drawable/mic_slash" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_centerInParent="true" - android:visibility="visible"/> - <ProgressBar - android:id="@+id/progress" - android:indeterminate="true" - android:indeterminateOnly="false" - android:layout_height="60dp" - android:layout_width="60dp" - android:layout_centerInParent="true" - android:visibility="gone"/> - </RelativeLayout> - <!-- - The text is set by the code. We specify a random text (voice_error), so the - text view does not have a zero height. This is necessary to keep the slash - mic and the recording mic is the same position - --> - <TextView - android:id="@+id/language" - android:text="@string/voice_error" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:singleLine="true" - android:textSize="15sp" - android:layout_marginTop="3dp" - android:layout_marginBottom="3dp" - android:layout_gravity="center" - android:textColor="#ffffff" - android:visibility="invisible"/> - <Button - android:id="@+id/button" - android:layout_width="match_parent" - android:layout_height="30dp" - android:singleLine="true" - android:focusable="true" - android:text="@string/cancel" - android:layout_gravity="center_horizontal" - android:background="@drawable/btn_center" - android:textColor="#ffffff" - android:textSize="15sp" /> - </LinearLayout> -</RelativeLayout> diff --git a/java/res/layout/voice_punctuation_hint.xml b/java/res/layout/voice_punctuation_hint.xml deleted file mode 100644 index b32feb6e2..000000000 --- a/java/res/layout/voice_punctuation_hint.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2009, 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. -*/ ---> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/keyboard_suggest_strip"> - - <!-- TODO: Use dark mic icon. --> - <ImageView android:id="@+id/image" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:layout_gravity="center_horizontal" - android:src="@drawable/ic_suggest_strip_microphone" - /> - - <TextView android:id="@+id/text" - android:text="@string/voice_punctuation_hint" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:paddingTop="2dp" - android:paddingRight="3dp" - android:textSize="13sp" - android:textColor="#888888" - android:layout_gravity="center_horizontal" - /> - -</LinearLayout> diff --git a/java/res/layout/voice_swipe_hint.xml b/java/res/layout/voice_swipe_hint.xml deleted file mode 100644 index b1e27c281..000000000 --- a/java/res/layout/voice_swipe_hint.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2009, 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. -*/ ---> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/keyboard_suggest_strip" - android:gravity="center_horizontal" - android:paddingTop="2dp"> - - <TextView android:id="@+id/text" - android:text="@string/voice_swipe_hint" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:paddingTop="10dp" - android:paddingRight="6dp" - android:textSize="13sp" - android:textColor="#888888" - android:layout_gravity="center_horizontal" - /> - - <ImageView - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_gravity="center_horizontal" - android:src="@drawable/ic_suggest_strip_microphone" - /> - - <ImageView - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_gravity="center_horizontal" - android:src="@drawable/ic_suggest_strip_microphone_swipe" - /> - - -</LinearLayout> diff --git a/java/res/values-nl/donottranslate-more-keys.xml b/java/res/values-nl/donottranslate-more-keys.xml index 4f5cbee55..73768aff2 100644 --- a/java/res/values-nl/donottranslate-more-keys.xml +++ b/java/res/values-nl/donottranslate-more-keys.xml @@ -40,8 +40,9 @@ U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX U+012F: "į" LATIN SMALL LETTER I WITH OGONEK - U+012B: "ī" LATIN SMALL LETTER I WITH MACRON --> - <string name="more_keys_for_i">í,ï,ì,î,į,ī</string> + U+012B: "ī" LATIN SMALL LETTER I WITH MACRON + U+0133: "ij" LATIN SMALL LIGATURE IJ --> + <string name="more_keys_for_i">í,ï,ì,î,į,ī,ij</string> <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX @@ -60,4 +61,6 @@ <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE --> <string name="more_keys_for_n">ñ,ń</string> + <!-- U+0133: "ij" LATIN SMALL LIGATURE IJ --> + <string name="more_keys_for_y">ij</string> </resources> diff --git a/java/res/values-zz/donottranslate-more-keys.xml b/java/res/values-zz/donottranslate-more-keys.xml new file mode 100644 index 000000000..eb984a469 --- /dev/null +++ b/java/res/values-zz/donottranslate-more-keys.xml @@ -0,0 +1,139 @@ +<?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. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE + U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE + U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX + U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE + U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS + U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE + U+00E6: "æ" LATIN SMALL LETTER AE + U+0101: "ā" LATIN SMALL LETTER A WITH MACRON + U+0103: "ă" LATIN SMALL LETTER A WITH BREVE + U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK + U+00AA: "ª" FEMININE ORDINAL INDICATOR --> + <string name="more_keys_for_a">à,á,â,ã,ä,å,æ,ã,å,ā,ă,ą,ª</string> + <!-- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE + U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE + U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX + U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS + U+0113: "ē" LATIN SMALL LETTER E WITH MACRON + U+0115: "ĕ" LATIN SMALL LETTER E WITH BREVE + U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE + U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK + U+011B: "ě" LATIN SMALL LETTER E WITH CARON --> + <string name="more_keys_for_e">è,é,ê,ë,ē,ĕ,ė,ę,ě</string> + <!-- U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE + U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE + U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX + U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS + U+0129: "ĩ" LATIN SMALL LETTER I WITH TILDE + U+012B: "ī" LATIN SMALL LETTER I WITH MACRON + U+012D: "ĭ" LATIN SMALL LETTER I WITH BREVE + U+012F: "į" LATIN SMALL LETTER I WITH OGONEK + U+0131: "ı" LATIN SMALL LETTER DOTLESS I + U+0133: "ij" LATIN SMALL LIGATURE IJ --> + <string name="more_keys_for_i">ì,í,î,ï,ĩ,ī,ĭ,į,ı,ij</string> + <!-- U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE + U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE + U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX + U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE + U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS + U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE + U+014D: "ō" LATIN SMALL LETTER O WITH MACRON + U+014F: "ŏ" LATIN SMALL LETTER O WITH BREVE + U+0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE + U+0153: "œ" LATIN SMALL LIGATURE OE + U+00BA: "º" MASCULINE ORDINAL INDICATOR --> + <string name="more_keys_for_o">ò,ó,ô,õ,ö,ø,ō,ŏ,ő,œ,º</string> + <!-- U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE + U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE + U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX + U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS + U+0169: "ũ" LATIN SMALL LETTER U WITH TILDE + U+016B: "ū" LATIN SMALL LETTER U WITH MACRON + U+016D: "ŭ" LATIN SMALL LETTER U WITH BREVE + U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE + U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE + U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK --> + <string name="more_keys_for_u">ù,ú,û,ü,ũ,ū,ŭ,ů,ű,ų</string> + <!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S + U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE + U+015D: "ŝ" LATIN SMALL LETTER S WITH CIRCUMFLEX + U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA + U+0161: "š" LATIN SMALL LETTER S WITH CARON + U+017F: "ſ" LATIN SMALL LETTER LONG S --> + <string name="more_keys_for_s">ß,ś,ŝ,ş,š,ſ</string> + <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE + U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE + U+0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA + U+0148: "ň" LATIN SMALL LETTER N WITH CARON + U+0149: "ʼn" LATIN SMALL LETTER N PRECEDED BY APOSTROPHE + U+014B: "ŋ" LATIN SMALL LETTER ENG --> + <string name="more_keys_for_n">ñ,ń,ņ,ň,ʼn,ŋ</string> + <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA + U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE + U+0109: "ĉ" LATIN SMALL LETTER C WITH CIRCUMFLEX + U+010B: "ċ" LATIN SMALL LETTER C WITH DOT ABOVE + U+010D: "č" LATIN SMALL LETTER C WITH CARON --> + <string name="more_keys_for_c">ç,ć,ĉ,ċ,č</string> + <!-- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE + U+0177: "ŷ" LATIN SMALL LETTER Y WITH CIRCUMFLEX + U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS + U+0133: "ij" LATIN SMALL LIGATURE IJ --> + <string name="more_keys_for_y">ý,ŷ,ÿ,ij</string> + <!-- U+010F: "ď" LATIN SMALL LETTER D WITH CARON + U+0111: "đ" LATIN SMALL LETTER D WITH STROKE + U+00F0: "ð" LATIN SMALL LETTER ETH --> + <string name="more_keys_for_d">ď,đ,ð</string> + <!-- U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE + U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA + U+0159: "ř" LATIN SMALL LETTER R WITH CARON --> + <string name="more_keys_for_r">ŕ,ŗ,ř</string> + <!-- U+00FE: "þ" LATIN SMALL LETTER THORN + U+0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA + U+0165: "ť" LATIN SMALL LETTER T WITH CARON + U+0167: "ŧ" LATIN SMALL LETTER T WITH STROKE --> + <string name="more_keys_for_t">þ,ţ,ť,ŧ</string> + <!-- U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE + U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE + U+017E: "ž" LATIN SMALL LETTER Z WITH CARON --> + <string name="more_keys_for_z">ź,ż,ž</string> + <!-- U+0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA + U+0138: "ĸ" LATIN SMALL LETTER KRA --> + <string name="more_keys_for_k">ķ,ĸ</string> + <!-- U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE + U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA + U+013E: "ľ" LATIN SMALL LETTER L WITH CARON + U+0140: "ŀ" LATIN SMALL LETTER L WITH MIDDLE DOT + U+0142: "ł" LATIN SMALL LETTER L WITH STROKE --> + <string name="more_keys_for_l">ĺ,ļ,ľ,ŀ,ł</string> + <!-- U+011D: "ĝ" LATIN SMALL LETTER G WITH CIRCUMFLEX + U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE + U+0121: "ġ" LATIN SMALL LETTER G WITH DOT ABOVE + U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA --> + <string name="more_keys_for_g">ĝ,ğ,ġ,ģ</string> + <!-- U+0125: "ĥ" LATIN SMALL LETTER H WITH CIRCUMFLEX --> + <string name="more_keys_for_h">ĥ</string> + <!-- U+0135: "ĵ" LATIN SMALL LETTER J WITH CIRCUMFLEX --> + <string name="more_keys_for_j">ĵ</string> + <!-- U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX --> + <string name="more_keys_for_w">ŵ</string> +</resources> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 3d4e776a7..b3f30c638 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -403,10 +403,9 @@ <attr name="parentStyle" format="string" /> </declare-styleable> - <!-- TODO: Should be removed. This is no longer required if InputMethodSubtype is supported. --> <declare-styleable name="KeyboardSet"> - <!-- Locale of the keyboard layouts --> - <attr name="keyboardLocale" format="string" /> + <!-- Disable shortcut key. Shortcut key is enabled by default. --> + <attr name="disableShortcutKey" format="boolean" /> </declare-styleable> <declare-styleable name="KeyboardSet_Element"> diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml index 8fbb2eff4..9b2780571 100644 --- a/java/res/values/donottranslate-more-keys.xml +++ b/java/res/values/donottranslate-more-keys.xml @@ -35,6 +35,9 @@ <string name="more_keys_for_l"></string> <string name="more_keys_for_g"></string> <string name="more_keys_for_v"></string> + <string name="more_keys_for_h"></string> + <string name="more_keys_for_j"></string> + <string name="more_keys_for_w"></string> <string name="keylabel_for_nordic_row1_11"></string> <string name="keylabel_for_nordic_row2_10"></string> <string name="keylabel_for_nordic_row2_11"></string> diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 74c68464c..68a8cabce 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -156,18 +156,22 @@ <string-array name="subtype_locale_exception_keys"> <item>en_US</item> <item>en_GB</item> - <item>de_ZZ</item> + <item>de_QY</item> + <item>zz_QY</item> </string-array> <string-array name="subtype_locale_exception_values"> <item>English (US)</item> <item>English (UK)</item> - <item>Deutsch (QWERTY)</item> + <item>@string/subtype_generic_qwerty</item> + <item>@string/subtype_qwerty</item> </string-array> <!-- Generic subtype label --> <string name="subtype_generic">%s</string> <!-- Description for generic QWERTY keyboard subtype --> <string name="subtype_generic_qwerty">%s (QWERTY)</string> + <!-- Description for language agnostic QWERTY keyboard subtype --> + <string name="subtype_qwerty">QWERTY</string> <!-- dictionary pack package name /settings activity (for shared prefs and settings) --> <string name="dictionary_pack_package_name">com.google.android.inputmethod.latin.dictionarypack</string> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index e1ac387fa..4f038e1a5 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -207,75 +207,6 @@ <!-- Spoken feedback after changing to the shifted phone dialer (symbols) keyboard. --> <string name="spoken_description_mode_phone_shift">Phone symbols mode</string> - <!-- Voice related labels --> - - <!-- Title of the warning dialog that shows when a user initiates voice input for - the first time. --> - <string name="voice_warning_title">Voice input</string> - - <!-- Message that gets put at the top of the warning dialog if the user is attempting to use - voice input in a currently unsupported locale. Voice input will work for such a user, - but it will only recognize them in English. --> - <string name="voice_warning_locale_not_supported">Voice input is not currently supported for your language, but does work in English.</string> - - <!-- Message of the warning dialog that shows when a user initiates voice input for - the first time, or turns it on in settings. [CHAR LIMIT=200] --> - <string name="voice_warning_may_not_understand">Voice input uses Google\'s speech recognition. <a href="http://m.google.com/privacy">The Mobile Privacy Policy</a> applies.</string> - - <!-- An additional part of the warning dialog for voice input that only shows when the user - actually initiates voice input, rather than just turning it on in settings. [CHAR LIMIT=200] --> - <string name="voice_warning_how_to_turn_off">To turn off voice input, go to input method settings.</string> - - <!-- Message to show when user enables the voice input settings (which says - "Press the microphone button"). [CHAR LIMIT=100] --> - <string name="voice_hint_dialog_message">To use voice input, press the microphone button.</string> - - <!-- Short message to tell the user the system is ready for them to speak. --> - <string name="voice_listening">Speak now</string> - - <!-- Short message shown after the user finishes speaking. --> - <string name="voice_working">Working</string> - - <!-- Short message shown before the user should speak. --> - <string name="voice_initializing"></string> - - <!-- Short message shown when a generic error occurs. --> - <string name="voice_error">Error. Please try again.</string> - - <!-- Short message shown for a network error. --> - <string name="voice_network_error">Couldn\'t connect</string> - - <!-- Short message shown for a network error where the utterance was really long, - in which case we should suggest that the user speak less. --> - <string name="voice_too_much_speech">Error, too much speech.</string> - - <!-- Short message shown for an audio error. --> - <string name="voice_audio_error">Audio problem</string> - - <!-- Short message shown for an error with the voice server. --> - <string name="voice_server_error">Server error</string> - - <!-- Short message shown when no speech is heard. --> - <string name="voice_speech_timeout">No speech heard</string> - - <!-- Short message shown when the server couldn't parse any speech. --> - <string name="voice_no_match">No matches found</string> - - <!-- Short message shown when the user initiates voice and voice search is not installed. --> - <string name="voice_not_installed">Voice search not installed</string> - - <!-- Short hint shown in candidate view to explain voice input. --> - <string name="voice_swipe_hint"><b>Hint:</b> Swipe across keyboard to speak</string> - - <!-- Short hint shown in candidate view to explain that user can speak punctuation. --> - <string name="voice_punctuation_hint"><b>Hint:</b> Next time, try speaking punctuation like \"period\", \"comma\", or \"question mark\".</string> - - <!-- Label on button to stop recognition. Must be short to fit on button. --> - <string name="cancel">Cancel</string> - - <!-- Label on button when an error occurs --> - <string name="ok">OK</string> - <!-- Preferences item for enabling speech input --> <string name="voice_input">Voice input key</string> @@ -294,9 +225,6 @@ <!-- On settings screen, voice input pop-up menu summary text to never show voice key [CHAR LIMIT=20] --> <string name="voice_input_modes_summary_off">Voice input is disabled</string> - <!-- Title of the dialog for selecting input methods. [CHAR LIMIT=20] --> - <string name="selectInputMethod">Select input method</string> - <!-- Title for configuring input method settings [CHAR LIMIT=35] --> <string name="configure_input_method">Configure input methods</string> diff --git a/java/res/xml-ar/keyboard_set.xml b/java/res/xml-ar/keyboard_set.xml index c37d128d7..88d320144 100644 --- a/java/res/xml-ar/keyboard_set.xml +++ b/java/res/xml-ar/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="ar" > + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_arabic" diff --git a/java/res/xml-be/keyboard_set.xml b/java/res/xml-be/keyboard_set.xml index 1b865ede0..959f644ea 100644 --- a/java/res/xml-be/keyboard_set.xml +++ b/java/res/xml-be/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="be"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_east_slavic" diff --git a/java/res/xml-bg/keyboard_set.xml b/java/res/xml-bg/keyboard_set.xml index e824826b3..593ad977c 100644 --- a/java/res/xml-bg/keyboard_set.xml +++ b/java/res/xml-bg/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="bg"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_bulgarian" diff --git a/java/res/xml-cs/keyboard_set.xml b/java/res/xml-cs/keyboard_set.xml index 6dea17aa5..f9f74516f 100644 --- a/java/res/xml-cs/keyboard_set.xml +++ b/java/res/xml-cs/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="cs"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwertz" diff --git a/java/res/xml-da/keyboard_set.xml b/java/res/xml-da/keyboard_set.xml index cc1096f37..0db9b1f59 100644 --- a/java/res/xml-da/keyboard_set.xml +++ b/java/res/xml-da/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="da"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_nordic" diff --git a/java/res/xml-de-rZZ/keyboard_set.xml b/java/res/xml-de-rQY/keyboard_set.xml index e874bda5f..8966ddbb0 100644 --- a/java/res/xml-de-rZZ/keyboard_set.xml +++ b/java/res/xml-de-rQY/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="de"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwerty" diff --git a/java/res/xml-de/keyboard_set.xml b/java/res/xml-de/keyboard_set.xml index 3b648e521..f9f74516f 100644 --- a/java/res/xml-de/keyboard_set.xml +++ b/java/res/xml-de/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="de"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwertz" diff --git a/java/res/xml-el/keyboard_set.xml b/java/res/xml-el/keyboard_set.xml index 5809e7f74..af74e12c5 100644 --- a/java/res/xml-el/keyboard_set.xml +++ b/java/res/xml-el/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="el"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_greek" diff --git a/java/res/xml-es/keyboard_set.xml b/java/res/xml-es/keyboard_set.xml index fd968fceb..4ff5b54f2 100644 --- a/java/res/xml-es/keyboard_set.xml +++ b/java/res/xml-es/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="es,es_US"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_spanish" diff --git a/java/res/xml-et/keyboard_set.xml b/java/res/xml-et/keyboard_set.xml index ddddcc64f..0db9b1f59 100644 --- a/java/res/xml-et/keyboard_set.xml +++ b/java/res/xml-et/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="et"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_nordic" diff --git a/java/res/xml-fa/keyboard_set.xml b/java/res/xml-fa/keyboard_set.xml index 0d16f8d7e..f508f8f29 100644 --- a/java/res/xml-fa/keyboard_set.xml +++ b/java/res/xml-fa/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="fa" > + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_farsi" diff --git a/java/res/xml-fi/keyboard_set.xml b/java/res/xml-fi/keyboard_set.xml index c40e828d6..0db9b1f59 100644 --- a/java/res/xml-fi/keyboard_set.xml +++ b/java/res/xml-fi/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="fi"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_nordic" diff --git a/java/res/xml-fr-rCA/keyboard_set.xml b/java/res/xml-fr-rCA/keyboard_set.xml index 8d780f544..8966ddbb0 100644 --- a/java/res/xml-fr-rCA/keyboard_set.xml +++ b/java/res/xml-fr-rCA/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="fr_CA"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwerty" diff --git a/java/res/xml-fr-rCH/keyboard_set.xml b/java/res/xml-fr-rCH/keyboard_set.xml index 601d2bc64..f9f74516f 100644 --- a/java/res/xml-fr-rCH/keyboard_set.xml +++ b/java/res/xml-fr-rCH/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="fr_CH"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwertz" diff --git a/java/res/xml-fr/keyboard_set.xml b/java/res/xml-fr/keyboard_set.xml index 4b827ca1b..2ac25c91d 100644 --- a/java/res/xml-fr/keyboard_set.xml +++ b/java/res/xml-fr/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="fr"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_azerty" diff --git a/java/res/xml-hi/keyboard_set.xml b/java/res/xml-hi/keyboard_set.xml index cb4dece2d..c1fd0712d 100644 --- a/java/res/xml-hi/keyboard_set.xml +++ b/java/res/xml-hi/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="hi"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_hindi" diff --git a/java/res/xml-hr/keyboard_set.xml b/java/res/xml-hr/keyboard_set.xml index 511644077..f9f74516f 100644 --- a/java/res/xml-hr/keyboard_set.xml +++ b/java/res/xml-hr/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="hr"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwertz" diff --git a/java/res/xml-hu/keyboard_set.xml b/java/res/xml-hu/keyboard_set.xml index 2139ac746..f9f74516f 100644 --- a/java/res/xml-hu/keyboard_set.xml +++ b/java/res/xml-hu/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="hu"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwertz" diff --git a/java/res/xml-is/keyboard_set.xml b/java/res/xml-is/keyboard_set.xml index c2ac94489..44edbba3e 100644 --- a/java/res/xml-is/keyboard_set.xml +++ b/java/res/xml-is/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="is"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_nordic" diff --git a/java/res/xml-iw/keyboard_set.xml b/java/res/xml-iw/keyboard_set.xml index d1da41a6b..538f656b2 100644 --- a/java/res/xml-iw/keyboard_set.xml +++ b/java/res/xml-iw/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="iw"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_hebrew" diff --git a/java/res/xml-ka/keyboard_set.xml b/java/res/xml-ka/keyboard_set.xml index 2be94689f..bc3df1ed0 100644 --- a/java/res/xml-ka/keyboard_set.xml +++ b/java/res/xml-ka/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="ka"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_georgian" diff --git a/java/res/xml-ky/keyboard_set.xml b/java/res/xml-ky/keyboard_set.xml index 0226bda5f..959f644ea 100644 --- a/java/res/xml-ky/keyboard_set.xml +++ b/java/res/xml-ky/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="ky"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_east_slavic" diff --git a/java/res/xml-mk/keyboard_set.xml b/java/res/xml-mk/keyboard_set.xml index 93874892e..6b8b84434 100644 --- a/java/res/xml-mk/keyboard_set.xml +++ b/java/res/xml-mk/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="mk"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_south_slavic" diff --git a/java/res/xml-nb/keyboard_set.xml b/java/res/xml-nb/keyboard_set.xml index 1675ed293..0db9b1f59 100644 --- a/java/res/xml-nb/keyboard_set.xml +++ b/java/res/xml-nb/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="nb"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_nordic" diff --git a/java/res/xml-pl/keyboard_set.xml b/java/res/xml-pl/keyboard_set.xml index fb0d13b98..8966ddbb0 100644 --- a/java/res/xml-pl/keyboard_set.xml +++ b/java/res/xml-pl/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="pl"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwerty" diff --git a/java/res/xml-pt/keyboard_set.xml b/java/res/xml-pt/keyboard_set.xml index f8140aac1..8966ddbb0 100644 --- a/java/res/xml-pt/keyboard_set.xml +++ b/java/res/xml-pt/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="pt"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwerty" diff --git a/java/res/xml-ro/keyboard_set.xml b/java/res/xml-ro/keyboard_set.xml index 73030fdc1..8966ddbb0 100644 --- a/java/res/xml-ro/keyboard_set.xml +++ b/java/res/xml-ro/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="ro"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwerty" diff --git a/java/res/xml-ru/keyboard_set.xml b/java/res/xml-ru/keyboard_set.xml index 393d58ef1..959f644ea 100644 --- a/java/res/xml-ru/keyboard_set.xml +++ b/java/res/xml-ru/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="ru"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_east_slavic" diff --git a/java/res/xml-sk/keyboard_set.xml b/java/res/xml-sk/keyboard_set.xml index db27b6107..8966ddbb0 100644 --- a/java/res/xml-sk/keyboard_set.xml +++ b/java/res/xml-sk/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="sk"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwerty" diff --git a/java/res/xml-sl/keyboard_set.xml b/java/res/xml-sl/keyboard_set.xml index 31f4714a9..8966ddbb0 100644 --- a/java/res/xml-sl/keyboard_set.xml +++ b/java/res/xml-sl/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="sl"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwerty" diff --git a/java/res/xml-sr/keyboard_set.xml b/java/res/xml-sr/keyboard_set.xml index f59f3a99d..5098134a7 100644 --- a/java/res/xml-sr/keyboard_set.xml +++ b/java/res/xml-sr/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="sr"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_south_slavic" diff --git a/java/res/xml-sv/keyboard_set.xml b/java/res/xml-sv/keyboard_set.xml index 2b106e0dc..0db9b1f59 100644 --- a/java/res/xml-sv/keyboard_set.xml +++ b/java/res/xml-sv/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="sv"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_nordic" diff --git a/java/res/xml-sw600dp/key_shortcut.xml b/java/res/xml-sw600dp/key_shortcut.xml index 8869ab930..d4c45ad22 100644 --- a/java/res/xml-sw600dp/key_shortcut.xml +++ b/java/res/xml-sw600dp/key_shortcut.xml @@ -28,7 +28,7 @@ > <Key latin:keyStyle="shortcutKeyStyle" - latin:keyLabelFlags="hasPopupHint" + latin:keyLabelFlags="hasPopupHint|preserveCase" latin:moreKeys="@string/settings_as_more_key" latin:keyWidth="fillBoth" /> </case> diff --git a/java/res/xml-th/keyboard_set.xml b/java/res/xml-th/keyboard_set.xml index 7362d8724..99e81b85e 100644 --- a/java/res/xml-th/keyboard_set.xml +++ b/java/res/xml-th/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="th"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_thai" diff --git a/java/res/xml-tr/keyboard_set.xml b/java/res/xml-tr/keyboard_set.xml index 01822a933..8966ddbb0 100644 --- a/java/res/xml-tr/keyboard_set.xml +++ b/java/res/xml-tr/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="tr"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwerty" diff --git a/java/res/xml-uk/keyboard_set.xml b/java/res/xml-uk/keyboard_set.xml index d782c9823..959f644ea 100644 --- a/java/res/xml-uk/keyboard_set.xml +++ b/java/res/xml-uk/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="uk"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_east_slavic" diff --git a/java/res/xml-vi/keyboard_set.xml b/java/res/xml-vi/keyboard_set.xml index e5f744f7a..8966ddbb0 100644 --- a/java/res/xml-vi/keyboard_set.xml +++ b/java/res/xml-vi/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="vi"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwerty" diff --git a/java/res/xml-zz-rQY/keyboard_set.xml b/java/res/xml-zz-rQY/keyboard_set.xml new file mode 100644 index 000000000..6fa97017c --- /dev/null +++ b/java/res/xml-zz-rQY/keyboard_set.xml @@ -0,0 +1,43 @@ +<?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. +*/ +--> + +<KeyboardSet + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:disableShortcutKey="true" > + <Element + latin:elementName="alphabet" + latin:elementKeyboard="@xml/kbd_qwerty" + latin:enableProximityCharsCorrection="true" /> + <Element + 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 + latin:elementName="phoneSymbols" + latin:elementKeyboard="@xml/kbd_phone_symbols" /> + <Element + latin:elementName="number" + latin:elementKeyboard="@xml/kbd_number" /> +</KeyboardSet> diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index 66d8d4d9d..d5a9a2629 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -34,7 +34,7 @@ <default> <key-style latin:styleName="f1MoreKeysStyle" - latin:keyLabelFlags="hasPopupHint" + latin:keyLabelFlags="hasPopupHint|preserveCase" latin:moreKeys="@string/settings_as_more_key" latin:backgroundType="functional" /> </default> diff --git a/java/res/xml/keyboard_set.xml b/java/res/xml/keyboard_set.xml index 83f9ea01c..8966ddbb0 100644 --- a/java/res/xml/keyboard_set.xml +++ b/java/res/xml/keyboard_set.xml @@ -19,8 +19,7 @@ --> <KeyboardSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardLocale="en_GB,en_US"> + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwerty" diff --git a/java/res/xml/language_prefs.xml b/java/res/xml/language_prefs.xml deleted file mode 100644 index b7a4c07db..000000000 --- a/java/res/xml/language_prefs.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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. ---> - -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/language_selection_title"> -</PreferenceScreen> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index d6ded6689..7a21a856b 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -27,7 +27,7 @@ cs: Czech/qwertz da: Danish/nordic de: German/qwertz - de_ZZ: German (QWERTY)/qwerty + de_QY: German (QWERTY)/qwerty el: Greek/greek en_US: English United States/qwerty en_GB: English Great Britain/qwerty @@ -63,6 +63,7 @@ tr: Turkish/qwerty uk: Ukrainian/east_slavic vi: Vietnamese/qwerty + zz_QY: QWERTY/qwerty --> <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. --> <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default @@ -74,7 +75,7 @@ android:label="@string/subtype_en_US" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" - android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,EnabledWhenDefaultIsNotAsciiCapable" + android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_en_GB" @@ -119,7 +120,7 @@ android:label="@string/subtype_generic_qwerty" android:imeSubtypeLocale="de" android:imeSubtypeMode="keyboard" - android:imeSubtypeExtraValue="AsciiCapable,KeyboardLocale=de_ZZ" + android:imeSubtypeExtraValue="AsciiCapable,KeyboardLocale=de_QY" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" @@ -310,4 +311,10 @@ android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable" /> + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_qwerty" + android:imeSubtypeLocale="zz_QY" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="AsciiCapable,EnabledWhenDefaultIsNotAsciiCapable" + /> </input-method> diff --git a/java/res/xml/rowkeys_azerty2.xml b/java/res/xml/rowkeys_azerty2.xml index 11bcd67c7..ff0b06240 100644 --- a/java/res/xml/rowkeys_azerty2.xml +++ b/java/res/xml/rowkeys_azerty2.xml @@ -35,9 +35,11 @@ latin:keyLabel="g" latin:moreKeys="@string/more_keys_for_g" /> <Key - latin:keyLabel="h" /> + latin:keyLabel="h" + latin:moreKeys="@string/more_keys_for_h" /> <Key - latin:keyLabel="j" /> + latin:keyLabel="j" + latin:moreKeys="@string/more_keys_for_j" /> <Key latin:keyLabel="k" latin:moreKeys="@string/more_keys_for_k" /> diff --git a/java/res/xml/rowkeys_azerty3.xml b/java/res/xml/rowkeys_azerty3.xml index 1a0eaccdc..b81c3c5a1 100644 --- a/java/res/xml/rowkeys_azerty3.xml +++ b/java/res/xml/rowkeys_azerty3.xml @@ -22,7 +22,8 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="w" /> + latin:keyLabel="w" + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="x" /> <Key diff --git a/java/res/xml/rowkeys_qwerty1.xml b/java/res/xml/rowkeys_qwerty1.xml index bd5e9a271..19067a70c 100644 --- a/java/res/xml/rowkeys_qwerty1.xml +++ b/java/res/xml/rowkeys_qwerty1.xml @@ -28,7 +28,8 @@ <Key latin:keyLabel="w" latin:keyHintLabel="2" - latin:additionalMoreKeys="2" /> + latin:additionalMoreKeys="2" + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="e" latin:keyHintLabel="3" diff --git a/java/res/xml/rowkeys_qwerty2.xml b/java/res/xml/rowkeys_qwerty2.xml index 4c983dfce..2fa8214a8 100644 --- a/java/res/xml/rowkeys_qwerty2.xml +++ b/java/res/xml/rowkeys_qwerty2.xml @@ -36,9 +36,11 @@ latin:keyLabel="g" latin:moreKeys="@string/more_keys_for_g" /> <Key - latin:keyLabel="h" /> + latin:keyLabel="h" + latin:moreKeys="@string/more_keys_for_h" /> <Key - latin:keyLabel="j" /> + latin:keyLabel="j" + latin:moreKeys="@string/more_keys_for_j" /> <Key latin:keyLabel="k" latin:moreKeys="@string/more_keys_for_k" /> diff --git a/java/res/xml/rowkeys_qwertz1.xml b/java/res/xml/rowkeys_qwertz1.xml index 27b8a7653..3e11a7ab4 100644 --- a/java/res/xml/rowkeys_qwertz1.xml +++ b/java/res/xml/rowkeys_qwertz1.xml @@ -28,7 +28,8 @@ <Key latin:keyLabel="w" latin:keyHintLabel="2" - latin:additionalMoreKeys="2" /> + latin:additionalMoreKeys="2" + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="e" latin:keyHintLabel="3" |
