PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 752824221d

Change-Id: I85e4c6c65165664f1cc4fbf28d55077b4f1b7b95
This commit is contained in:
Beverly
2018-04-10 15:29:15 -07:00
committed by android-build-merger
parent c32f896d65 752824221d
commit 060283f2de
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@@ -790,7 +790,7 @@
android:icon="@drawable/ic_settings_notifications" android:icon="@drawable/ic_settings_notifications"
android:exported="true" android:exported="true"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"> android:parentActivityName="Settings$ZenModeSettingsActivity">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.ZEN_MODE_AUTOMATION_SETTINGS" /> <action android:name="android.settings.ZEN_MODE_AUTOMATION_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -853,7 +853,7 @@
android:name="Settings$ZenModeScheduleRuleSettingsActivity" android:name="Settings$ZenModeScheduleRuleSettingsActivity"
android:exported="true" android:exported="true"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"> android:parentActivityName="Settings$ZenModeAutomationSettingsActivity">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS" /> <action android:name="android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -872,7 +872,7 @@
android:name="Settings$ZenModeEventRuleSettingsActivity" android:name="Settings$ZenModeEventRuleSettingsActivity"
android:exported="true" android:exported="true"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"> android:parentActivityName="Settings$ZenModeAutomationSettingsActivity">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.ZEN_MODE_EVENT_RULE_SETTINGS" /> <action android:name="android.settings.ZEN_MODE_EVENT_RULE_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />