Merge "Remove SHOW_INPUT_METHOD_PICKER receiver" into oc-mr1-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9abf62f..d553573 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -671,13 +671,6 @@
android:value="true" />
</activity>
- <receiver android:name=".inputmethod.InputMethodDialogReceiver"
- android:enabled="true">
- <intent-filter>
- <action android:name="android.settings.SHOW_INPUT_METHOD_PICKER" />
- </intent-filter>
- </receiver>
-
<activity android:name="Settings$UserDictionarySettingsActivity"
android:label="@string/user_dict_settings_title"
android:taskAffinity="com.android.settings"
diff --git a/src/com/android/settings/inputmethod/InputMethodDialogReceiver.java b/src/com/android/settings/inputmethod/InputMethodDialogReceiver.java
deleted file mode 100644
index e442e88..0000000
--- a/src/com/android/settings/inputmethod/InputMethodDialogReceiver.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.inputmethod;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.view.inputmethod.InputMethodManager;
-
-public class InputMethodDialogReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (Settings.ACTION_SHOW_INPUT_METHOD_PICKER.equals(intent.getAction())) {
- ((InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE))
- .showInputMethodPicker(true /* showAuxiliarySubtypes */);
- }
- }
-}