diff options
41 files changed, 2 insertions, 367 deletions
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index e663c90f2..9f62e9779 100644 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -49,15 +49,6 @@ </intent-filter> </activity> - <activity android:name="com.android.inputmethod.deprecated.languageswitcher.InputLanguageSelection" - android:label="@string/language_selection_title"> - <intent-filter> - <action android:name="android.intent.action.MAIN"/> - <action android:name="com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION"/> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - </activity> - <receiver android:name="SuggestionSpanPickedNotificationReceiver" android:enabled="true"> <intent-filter> <action android:name="android.text.style.SUGGESTION_PICKED" /> 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/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/src/com/android/inputmethod/compat/CompatUtils.java b/java/src/com/android/inputmethod/compat/CompatUtils.java index b42633cd9..ba82a06ac 100644 --- a/java/src/com/android/inputmethod/compat/CompatUtils.java +++ b/java/src/com/android/inputmethod/compat/CompatUtils.java @@ -32,8 +32,6 @@ public class CompatUtils { // TODO: Can these be constants instead of literal String constants? private static final String INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS"; - private static final String INPUT_LANGUAGE_SELECTION = - "com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION"; public static Intent getInputLanguageSelectionIntent(String inputMethodId, int flagsForSubtypeSettings) { @@ -51,11 +49,9 @@ public class CompatUtils { if (flagsForSubtypeSettings > 0) { intent.setFlags(flagsForSubtypeSettings); } - } else { - action = INPUT_LANGUAGE_SELECTION; - intent = new Intent(action); + return intent; } - return intent; + throw new RuntimeException("Language selection doesn't supported on this platform"); } public static Class<?> getClass(String className) { |
