Add safety & regulatory info to "about device".

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7617c39..f72aa8e 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -198,7 +198,7 @@
             <meta-data android:name="com.android.settings.category"
                 android:value="com.android.settings.category.wireless" />
             <meta-data android:name="com.android.settings.title"
-                android:value="@string/radio_controls_title" />
+                android:resource="@string/radio_controls_title" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.WirelessSettings" />
             <!-- Note that this doesn't really show any Wireless settings. -->
@@ -848,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>
@@ -980,7 +976,7 @@
             <meta-data android:name="com.android.settings.category"
                 android:value="com.android.settings.category.system" />
             <meta-data android:name="com.android.settings.title"
-                android:value="@string/about_settings" />
+                android:resource="@string/about_settings" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DeviceInfoSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1733,6 +1729,7 @@
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
         <activity android:name=".SetupEncryptionInterstitial"
+            android:label="@string/encryption_interstitial_header"
             android:taskAffinity="com.android.wizard"
             android:theme="@style/SetupWizardDisableAppStartingTheme"/>
 
@@ -1795,7 +1792,7 @@
             <meta-data android:name="com.android.settings.category"
                 android:value="com.android.settings.category.device" />
             <meta-data android:name="com.android.settings.title"
-                android:value="@string/storage_usb_settings" />
+                android:resource="@string/storage_usb_settings" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.deviceinfo.StorageSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -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>
@@ -2971,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>