Merge "Import translations. DO NOT MERGE" into pi-dev

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f224eca..2713216 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -715,7 +715,7 @@
         <activity
             android:name="Settings$ZenModeSettingsActivity"
             android:label="@string/zen_mode_settings_title"
-            android:icon="@drawable/ic_settings_notifications"
+            android:icon="@drawable/ic_notifications"
             android:exported="true"
             android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings">
@@ -741,7 +741,7 @@
         <activity
             android:name=".notification.ZenSuggestionActivity"
             android:label="@string/zen_mode_settings_title"
-            android:icon="@drawable/ic_zen"
+            android:icon="@drawable/ic_do_not_disturb_on_24dp"
             android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -762,7 +762,7 @@
         <activity
             android:name=".notification.ZenOnboardingActivity"
             android:label="@string/zen_onboarding_dnd_visual_disturbances_header"
-            android:icon="@drawable/ic_settings_notifications"
+            android:icon="@drawable/ic_notifications"
             android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
             android:exported="true"
             android:taskAffinity="com.android.settings"
@@ -775,7 +775,7 @@
         <activity
             android:name="Settings$ZenModeAutomationSettingsActivity"
             android:label="@string/zen_mode_automation_settings_title"
-            android:icon="@drawable/ic_settings_notifications"
+            android:icon="@drawable/ic_notifications"
             android:exported="true"
             android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings$ZenModeSettingsActivity">
@@ -3137,6 +3137,8 @@
                        android:value="com.android.settings.accounts.AccountDashboardFragment"/>
             <meta-data android:name="com.android.settings.category"
                        android:value="com.android.settings.category.ia.homepage"/>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
         </activity>
 
         <activity