X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=AndroidManifest.xml;h=f72aa8ecddaa5440529f62d63607cb70d93160f2;hb=1fad9af3c7b16669fc5d31f442fbd85e380001e9;hp=e8271a8e4c2ba462202536f95faa12c97a7365f4;hpb=a4bc49e55e5210d6a5b0eff5f627ef24b4d242b9;p=android-x86%2Fpackages-apps-Settings.git

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e8271a8e4c..f72aa8ecdd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -81,6 +81,7 @@
     <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" />
     <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
     <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
 
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
@@ -847,10 +848,6 @@
                   android:label="@string/wallpaper_settings_fragment_title"
                   android:icon="@drawable/ic_wallpaper"
                   android:taskAffinity="">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.WALLPAPER_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.WallpaperTypeSettings" />
         </activity>
@@ -1579,7 +1576,7 @@
             android:enabled="false"
             android:exported="true"
             android:taskAffinity="com.android.wizard"
-            android:theme="@style/SetupWizardDisableAppStartingTheme"
+            android:theme="@style/SuwThemeGlif.Light"
             android:icon="@drawable/ic_suggested_notifications">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -2668,7 +2665,7 @@
 
         <!-- Show regulatory info (from settings item or dialing "*#07#") -->
         <activity android:name="RegulatoryInfoDisplayActivity"
-                  android:label="@string/regulatory_information"
+                  android:label="@string/regulatory_labels"
                   android:taskAffinity=""
                   android:enabled="@bool/config_show_regulatory_info">
             <intent-filter>
@@ -2901,6 +2898,17 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name="Settings$DeletionHelperActivity"
+                  android:label="@string/deletion_helper_title"
+                  android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.DELETION_HELPER_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.deletionhelper.DeletionHelperFragment" />
+        </activity>
+
         <service
             android:name=".SettingsDumpService"
             android:exported="true"
@@ -2960,6 +2968,22 @@
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
         </service>
+
+        <!-- Automatic storage management tasks. -->
+        <service
+            android:name=".deletionhelper.AutomaticStorageManagementJobService"
+            android:label="@string/automatic_storage_manager_service_label"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:enabled="@bool/enable_automatic_storage_management"
+            android:exported="false"/>
+
+        <receiver android:name=".deletionhelper.AutomaticStorageBroadcastReceiver"
+                  android:enabled="@bool/enable_automatic_storage_management">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
 </manifest>