commit 200da8978f45d2afeeaa8f5a5a03603102d7809e
author Julia Reynolds <juliacr@google.com> Fri May 04 08:54:53 2018 -0400
committer Beverly <beverlyt@google.com> Thu May 10 13:25:35 2018 -0400
tree 6f27b88a6ca3e8a85d3e0b57e719daeeadc234af
parent f95ed0925ba3492bcc55874981effa40186ccdd7

DND settings redesign

Test: robotests
Change-Id: I7b980218feea28e945994c8b7f8a934df6bc11f9
Bug: 78447976

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 52a18b9..b59ee56 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -727,6 +727,10 @@
                 <action android:name="android.settings.ZEN_MODE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ZEN_MODE_PRIORITY_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -753,23 +757,6 @@
         </activity>
 
         <activity
-            android:name="Settings$ZenModeBehaviorSettingsActivity"
-            android:label="@string/zen_mode_behavior_settings_title"
-            android:icon="@drawable/ic_settings_notifications"
-            android:exported="true"
-            android:taskAffinity="com.android.settings"
-            android:parentActivityName="Settings">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.ZEN_MODE_PRIORITY_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.ZenModeBehaviorSettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
-
-        <activity
             android:name="Settings$ZenModeAutomationSettingsActivity"
             android:label="@string/zen_mode_automation_settings_title"
             android:icon="@drawable/ic_settings_notifications"