commit 86997beac8ccd3d9e1deedb4a7afe6ddeb3a0bd7
author The Android Open Source Project <initial-contribution@android.com> Thu Mar 05 14:34:39 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Thu Mar 05 14:34:39 2009 -0800
tree ac763107b04b54bd2f710327f0bdaa6dc5999599
parent afc4ab2ffbb8327ddce9907961295a32cbf49d0f

auto import from //depot/cupcake/@136594

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cab768d..3c9a79a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -149,6 +149,14 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="PhysicalKeyboardSettings" 
+                android:label="@string/builtin_keyboard_settings_title">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="InputMethodsSettings" android:icon="@drawable/app_settings"
                 android:label="@string/input_methods_settings_title"
                 >
@@ -393,14 +401,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="DeviceInfo" android:label="@string/device_info_label">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-            </intent-filter>
-        </activity>
-
         <!-- DeviceInfo adds the user's requested build to stats upload.  -->
         <receiver android:name=".DeviceInfo$StatsReportReceiver">
             <intent-filter>