am 39c3d10b: am 0e2ab4f8: New top-level Dock in Settings and a Dock Settings screen...

[android-x86/packages-apps-Settings.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b49590e..0f6dae3 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -32,7 +32,7 @@
     <uses-permission android:name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>
     <uses-permission android:name="android.permission.READ_USER_DICTIONARY"/>
     <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY"/>
-    <uses-permission android:name="android.permission.RESTART_PACKAGES"/>
+    <uses-permission android:name="android.permission.FORCE_STOP_PACKAGES"/>
     <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
     <uses-permission android:name="android.permission.BATTERY_STATS"/>
     <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
@@ -265,6 +265,19 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="DockSettings"
+                android:label="@string/dock_settings_title"
+                android:clearTaskOnLaunch="true"
+                >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="com.android.settings.DOCK_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="DeviceInfoSettings" android:label="@string/device_info_settings"
                 >
             <intent-filter>
@@ -374,6 +387,19 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="DeviceAdminSettings"
+                android:label="@string/device_admin_settings_title"
+                android:clearTaskOnLaunch="true"
+                >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.app.action.ADD_DEVICE_ADMIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="IccLockSettings" android:label="@string/sim_lock_settings"
                 android:process="com.android.phone">
             <intent-filter>
@@ -406,26 +432,33 @@
         <!-- Second and third-level settings -->
 
         <activity android:name="ConfirmLockPattern"/>
+        <activity android:name="ConfirmLockPassword"
+            android:theme="@android:style/Theme.NoTitleBar">
+        </activity>
 
-        <activity android:name="ChooseLockPattern" android:label="@string/lockpattern_change_lock_pattern_label">
+        <activity android:name="ChooseLockGeneric"
+                android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
-                <action android:name="android.intent.action.DEFAULT" />
+                <action android:name="android.app.action.SET_NEW_PASSWORD" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
+        <activity android:name="ChooseLockPattern"
+                android:label="@string/lockpattern_change_lock_pattern_label">
+        </activity>
+
+        <activity android:name="ChooseLockPassword"
+                android:label="@string/lockpattern_change_lock_pin_label"
+            android:theme="@android:style/Theme.NoTitleBar">
+        </activity>
+
         <activity android:name="ChooseLockPatternTutorial"
-            android:label="@string/lockpattern_change_lock_pattern_label"
-            >
-            <intent-filter>
-                <action android:name="android.intent.action.DEFAULT" />
-            </intent-filter>
+            android:label="@string/lockpattern_change_lock_pattern_label">
         </activity>
 
         <activity android:name="ChooseLockPatternExample"
             android:label="@string/lockpattern_change_lock_pattern_label">
-            <intent-filter>
-                <action android:name="android.intent.action.DEFAULT" />
-            </intent-filter>
         </activity>
 
         <activity android:name="ZoneList" android:label="@string/choose_timezone" />
@@ -525,6 +558,7 @@
             android:name=".bluetooth.DockEventReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.DOCK_EVENT" />
+                <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
@@ -671,12 +705,6 @@
             </intent-filter>
         </activity>
 
-        <!-- Helper to bind any unbound widgets in Launcher, used as
-             part of initialization and upgrade process -->
-        <activity android:name="LauncherAppWidgetBinder"
-                android:permission="android.permission.BIND_APPWIDGET"
-                android:theme="@android:style/Theme.NoDisplay" android:exported="true" />
-
         <activity android:name="UsageStats" android:label="@string/usage_stats_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />