commit f24037da6570fa7b33122c34bcca1a8065df6370
author John Spurlock <jspurlock@google.com> Tue Apr 14 01:01:43 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 14 01:01:44 2015 +0000
tree 48c20525000e2e8bcc0926115df8c387e91a1e65
parent ca59f4ffb3000eafab273dd76b51192b26fd53e7
parent c1df2aa9639a27fa6d759b21a760b6b63e38a1c2

Merge "Settings: Register zen priority settings entry point."

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 0fdf04b..e8be34a 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -100,6 +100,7 @@
 import com.android.settings.notification.NotificationStation;
 import com.android.settings.notification.OtherSoundSettings;
 import com.android.settings.notification.ZenModeExternalRuleSettings;
+import com.android.settings.notification.ZenModePrioritySettings;
 import com.android.settings.notification.ZenModeSettings;
 import com.android.settings.notification.ZenModeScheduleRuleSettings;
 import com.android.settings.print.PrintJobSettingsFragment;
@@ -335,6 +336,7 @@
             OtherSoundSettings.class.getName(),
             ApnSettings.class.getName(),
             WifiCallingSettings.class.getName(),
+            ZenModePrioritySettings.class.getName(),
             ZenModeScheduleRuleSettings.class.getName(),
             ZenModeExternalRuleSettings.class.getName(),
     };