commit e6dd1fa1851302710ac7845d25d8ad8a5b6ee438
author The Android Open Source Project <initial-contribution@android.com> Wed Mar 18 17:39:48 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Mar 18 17:39:48 2009 -0700
tree f5a8545397cd15f5bedf524a0673d88d5dd8d182
parent 72ed6feab24308a0acd1fa2135afa3476759cf39

auto import from //branches/cupcake_rel/...@140373

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e59e060..ef5e072 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -145,6 +145,8 @@
                 >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -157,16 +159,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="InputMethodsSettings" android:icon="@drawable/app_settings"
-                android:label="@string/input_methods_settings_title"
-                >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-            </intent-filter>
-        </activity>
-
         <activity android:name="UserDictionarySettings" android:icon="@drawable/app_settings"
                 android:label="@string/user_dict_settings_titlebar">
             <intent-filter>