summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/Settings.java
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-04-30 15:45:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-30 15:45:57 +0000
commit5982d17a2623aa6ef7597acb43738d92803c7b43 (patch)
tree454a81a42d21fffa11d3a107d8f992516e91539a /src/com/android/settings/Settings.java
parentd527f420860e8dfaa7fd87d0c53220fcd87ec5b6 (diff)
parentf57bad7d5b0f9044231fc52351ed27e14013f491 (diff)
downloadpackages_apps_Settings-5982d17a2623aa6ef7597acb43738d92803c7b43.zip
packages_apps_Settings-5982d17a2623aa6ef7597acb43738d92803c7b43.tar.gz
packages_apps_Settings-5982d17a2623aa6ef7597acb43738d92803c7b43.tar.bz2
Merge "Settings: Do not disturb automatic rule updates." into mnc-dev
Diffstat (limited to 'src/com/android/settings/Settings.java')
-rw-r--r--src/com/android/settings/Settings.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index f073b43..6723839 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -100,6 +100,7 @@ public class Settings extends SettingsActivity {
public static class ZenModePrioritySettingsActivity extends SettingsActivity { /* empty */ }
public static class ZenModeAutomationSettingsActivity extends SettingsActivity { /* empty */ }
public static class ZenModeScheduleRuleSettingsActivity extends SettingsActivity { /* empty */ }
+ public static class ZenModeEventRuleSettingsActivity extends SettingsActivity { /* empty */ }
public static class ZenModeExternalRuleSettingsActivity extends SettingsActivity { /* empty */ }
public static class NotificationSettingsActivity extends SettingsActivity { /* empty */ }
public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }