Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show new visual effects options in dnd settings" into pi-dev am: e056b2ebc9

Browse Source 
am: 45e8898f7e

Change-Id: I380430deac85016196bfcc4f9f469c9b49c3fef8
This commit is contained in:
Julia Reynolds
2018-03-09 17:04:54 +00:00
committed by android-build-merger
parent 39ba053925 45e8898f7e
commit 7ba6604850
18 changed files with 601 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
AndroidManifest.xml
View File

@@ -738,6 +738,19 @@
android:value="true" />
</activity>
<activity
android:name="Settings$ZenModeBlockedEffectsSettingsActivity"
android:label="@string/zen_mode_what_to_block_title"
android:icon="@drawable/ic_settings_notifications"
android:exported="true"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.notification.ZenModeBlockedEffectsSetting" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
<activity
android:name="Settings$ZenModeBehaviorSettingsActivity"
android:label="@string/zen_mode_behavior_settings_title"