diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index e663c90f23999c2fde95dc7019aef6c8a10afad8..9f62e9779974e1e7499356291df00d9c669b6edb 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
deleted file mode 100644
index 61eb4dd62bb1534f80a9ff77e010f463125625a2..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/caution.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/ic_mic_dialog.png b/java/res/drawable-hdpi/ic_mic_dialog.png
deleted file mode 100644
index 6107f876e76accbb824ac55c2193ec686f564df0..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/ic_mic_dialog.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/ic_suggest_strip_microphone.png b/java/res/drawable-hdpi/ic_suggest_strip_microphone.png
deleted file mode 100644
index 189a861fb45f709e33774b2eb11904ff92277b40..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/ic_suggest_strip_microphone.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png b/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png
deleted file mode 100644
index b4a6e373bfbeff4191e3a7fa3f046c9f2d5cf95c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/mic_base.png b/java/res/drawable-hdpi/mic_base.png
deleted file mode 100644
index 504a1aa2a40206de804af264c06b2763c31ee996..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/mic_base.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/mic_full.png b/java/res/drawable-hdpi/mic_full.png
deleted file mode 100644
index 3f4a676579f9536b40fa9d10c2d4a584a0e2a644..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/mic_full.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/mic_slash.png b/java/res/drawable-hdpi/mic_slash.png
deleted file mode 100644
index c3b10929ba2d3c4e5f7b8865c9ea48ec48e0ff69..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/mic_slash.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/vs_dialog_blue.9.png b/java/res/drawable-hdpi/vs_dialog_blue.9.png
deleted file mode 100644
index 4f813ead33821b8b7929ae40c7fca599b983ed5c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/vs_dialog_blue.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/vs_dialog_red.9.png b/java/res/drawable-hdpi/vs_dialog_red.9.png
deleted file mode 100644
index a2055600e28c9f7ea64b5e28d19af37747261f6f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/vs_dialog_red.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/vs_dialog_yellow.9.png b/java/res/drawable-hdpi/vs_dialog_yellow.9.png
deleted file mode 100644
index ce664b6768bcf6f61c144e42f61fa96d9b1a7ded..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/vs_dialog_yellow.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/vs_popup_mic_edge.png b/java/res/drawable-hdpi/vs_popup_mic_edge.png
deleted file mode 100644
index 4ff6337a2c0b4458cb2fe3ca26c19695c2847302..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/vs_popup_mic_edge.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/caution.png b/java/res/drawable-mdpi/caution.png
deleted file mode 100644
index eaef534254f1b5feef517949b559f5653b81fcba..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/caution.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/ic_mic_dialog.png b/java/res/drawable-mdpi/ic_mic_dialog.png
deleted file mode 100644
index 77613ca05c3686518c0879d325adb0111ead893d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/ic_mic_dialog.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/ic_suggest_strip_microphone.png b/java/res/drawable-mdpi/ic_suggest_strip_microphone.png
deleted file mode 100644
index 18f314a61a15f05cb20aad5dd8ad317eb3b4c70e..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/ic_suggest_strip_microphone.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/ic_suggest_strip_microphone_swipe.png b/java/res/drawable-mdpi/ic_suggest_strip_microphone_swipe.png
deleted file mode 100644
index ff629b6744095c35ecc715ed6a91ff90c7b28e8d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/ic_suggest_strip_microphone_swipe.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/mic_base.png b/java/res/drawable-mdpi/mic_base.png
deleted file mode 100644
index 53e29ff4b9faca2657b2d023dd15b610f9c00c01..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/mic_base.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/mic_full.png b/java/res/drawable-mdpi/mic_full.png
deleted file mode 100644
index e3e3dfac30a7afe1b2a524764a3b74d532863029..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/mic_full.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/mic_slash.png b/java/res/drawable-mdpi/mic_slash.png
deleted file mode 100644
index d04b56344667f58cf07d4f964b37326c2168616f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/mic_slash.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/vs_dialog_blue.9.png b/java/res/drawable-mdpi/vs_dialog_blue.9.png
deleted file mode 100644
index cf27e8f43b4fae87fc9c5f388c85305e87c94dc6..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/vs_dialog_blue.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/vs_dialog_red.9.png b/java/res/drawable-mdpi/vs_dialog_red.9.png
deleted file mode 100644
index 6c08d5a3087d2f908add4ebb2fa9d9948aec6817..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/vs_dialog_red.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/vs_dialog_yellow.9.png b/java/res/drawable-mdpi/vs_dialog_yellow.9.png
deleted file mode 100644
index 2fb06c263647a1b9f38608fe03ea5675ed2aea94..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/vs_dialog_yellow.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/vs_popup_mic_edge.png b/java/res/drawable-mdpi/vs_popup_mic_edge.png
deleted file mode 100644
index 4ff6337a2c0b4458cb2fe3ca26c19695c2847302..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/vs_popup_mic_edge.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/caution.png b/java/res/drawable-xhdpi/caution.png
deleted file mode 100644
index cfc3f7547d31e41baf8b77d032343ba33b4091fe..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/caution.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/ic_mic_dialog.png b/java/res/drawable-xhdpi/ic_mic_dialog.png
deleted file mode 100644
index 5d6399c0ac1116ef0659b774397610a23167b920..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/ic_mic_dialog.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/ic_suggest_strip_microphone.png b/java/res/drawable-xhdpi/ic_suggest_strip_microphone.png
deleted file mode 100644
index d65d287084bdcaab10cb5cf1363a743aaae1f3db..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/ic_suggest_strip_microphone.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/ic_suggest_strip_microphone_swipe.png b/java/res/drawable-xhdpi/ic_suggest_strip_microphone_swipe.png
deleted file mode 100644
index 889378a6afd64e458844e514e42dc30db67e659d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/ic_suggest_strip_microphone_swipe.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/mic_base.png b/java/res/drawable-xhdpi/mic_base.png
deleted file mode 100644
index 5c060bec95e5b8542d1225540b004a50bee84b8d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/mic_base.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/mic_full.png b/java/res/drawable-xhdpi/mic_full.png
deleted file mode 100644
index 32ffe124e5979233b6e92bf783b161bdacbf881e..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/mic_full.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/mic_slash.png b/java/res/drawable-xhdpi/mic_slash.png
deleted file mode 100644
index 18b22542b1ac3eaa22fd8d639734ac3561325200..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/mic_slash.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/vs_dialog_blue.9.png b/java/res/drawable-xhdpi/vs_dialog_blue.9.png
deleted file mode 100644
index 3284d78efcd37fa1e8b8638d35eec1771b8de766..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/vs_dialog_blue.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/vs_dialog_red.9.png b/java/res/drawable-xhdpi/vs_dialog_red.9.png
deleted file mode 100644
index 5af2465b5c21d202d292b16fdda41ccc34caf82c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/vs_dialog_red.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/vs_dialog_yellow.9.png b/java/res/drawable-xhdpi/vs_dialog_yellow.9.png
deleted file mode 100644
index 4f50439de8b4d35170767f27d1bbe1db0e674a53..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/vs_dialog_yellow.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/vs_popup_mic_edge.png b/java/res/drawable-xhdpi/vs_popup_mic_edge.png
deleted file mode 100644
index 1063cb4641b7448203042d749ebbd7f27a5e6c8a..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/vs_popup_mic_edge.png and /dev/null differ
diff --git a/java/res/drawable/background_voice.xml b/java/res/drawable/background_voice.xml
deleted file mode 100644
index 49a4191102ed60d1cdcfc64b41198493abbee94d..0000000000000000000000000000000000000000
--- 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 d476651c6c8e792445e53122bddfc342361c0744..0000000000000000000000000000000000000000
--- 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 57878883120424621afd50011971fd7abf599581..0000000000000000000000000000000000000000
--- 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 b32feb6e2cfcf142f619715cc90fe74c77aff44c..0000000000000000000000000000000000000000
--- 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 b1e27c281f7e9f3affd6a1de999251168257cd87..0000000000000000000000000000000000000000
--- 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 b7a4c07db608684de7295b1cbb6618727a0a8736..0000000000000000000000000000000000000000
--- 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 b42633cd943bf16bde7df28313838eb8e276adc1..ba82a06aca0a761439a141c648f4a21b6dce6ffb 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) {