Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 060283f2 authored by Beverly's avatar Beverly Committed by android-build-merger
Browse files

Merge "Set parent for auto zen rules to be zen rule page" into pi-dev am: 45fe0bb6 

am: 75282422

Change-Id: I85e4c6c65165664f1cc4fbf28d55077b4f1b7b95
parents c32f896d 75282422

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ 
            android:icon="@drawable/ic_settings_notifications"

            android:exported="true"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            android:parentActivityName="Settings$ZenModeSettingsActivity">

            <intent-filter android:priority="1">

                <action android:name="android.settings.ZEN_MODE_AUTOMATION_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -853,7 +853,7 @@ 
            android:name="Settings$ZenModeScheduleRuleSettingsActivity"

            android:exported="true"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            android:parentActivityName="Settings$ZenModeAutomationSettingsActivity">

            <intent-filter android:priority="1">

                <action android:name="android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -872,7 +872,7 @@ 
            android:name="Settings$ZenModeEventRuleSettingsActivity"

            android:exported="true"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            android:parentActivityName="Settings$ZenModeAutomationSettingsActivity">

            <intent-filter android:priority="1">

                <action android:name="android.settings.ZEN_MODE_EVENT_RULE_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />