am a6e4db3c: am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9a33e28..11665b0 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -86,18 +86,30 @@
                 android:label="@string/settings_label_launcher"
                 android:launchMode="singleTask">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
+        <!-- Alias for launcher activity only, as this belongs to each profile. -->
+        <activity-alias android:name="Settings"
+                android:taskAffinity="com.android.settings"
+                android:label="@string/settings_label_launcher"
+                android:launchMode="singleTask"
+                android:targetActivity="Settings">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
+
         <receiver android:name="ManagedProfileSetup">
             <intent-filter>
                 <action android:name="android.intent.action.USER_INITIALIZE"/>
+                <action android:name="android.intent.action.PRE_BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
 
@@ -137,18 +149,6 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="AirplaneModeVoiceActivity"
-                android:label="@string/wireless_networks_settings_title"
-                android:theme="@android:style/Theme.Material.Light.Voice"
-                android:exported="true"
-                android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.settings.VOICE_CONTROL_AIRPLANE_MODE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE" />
-            </intent-filter>
-        </activity>
-
         <!-- Top-level settings -->
 
         <activity android:name="Settings$WifiSettingsActivity"
@@ -406,6 +406,8 @@
                 android:value="com.android.settings.vpn2.VpnSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/wireless_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
         </activity>
 
         <activity android:name="Settings$DateTimeSettingsActivity"
@@ -1117,7 +1119,15 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".notification.RedactionInterstitial" />
+        <activity android:name=".notification.RedactionInterstitial"/>
+
+        <activity android:name=".notification.RedactionSettingsStandalone"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.settings.ACTION_APP_NOTIFICATION_REDACTION" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <activity android:name="ConfirmLockPattern"/>