summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/Settings.java
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-04-03 23:53:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-03 23:53:04 +0000
commit385c5acbd6b496ea1adae9e633673775bc365984 (patch)
tree3a14002357bfdd630290fbbdcc08d2668c4222ec /src/com/android/settings/Settings.java
parent4d2c022c1337920b8a03a5650c2cff719d5e3660 (diff)
parentd8b36835707edbeeb9c9fbc30eba855a0b6231c6 (diff)
downloadpackages_apps_Settings-385c5acbd6b496ea1adae9e633673775bc365984.zip
packages_apps_Settings-385c5acbd6b496ea1adae9e633673775bc365984.tar.gz
packages_apps_Settings-385c5acbd6b496ea1adae9e633673775bc365984.tar.bz2
Merge "Settings: Move downtime to new automation sub-settings page."
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 dc4ae48..70455a4 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -95,6 +95,7 @@ public class Settings extends SettingsActivity {
public static class PrintJobSettingsActivity extends SettingsActivity { /* empty */ }
public static class ZenModeSettingsActivity extends SettingsActivity { /* empty */ }
public static class ZenModePrioritySettingsActivity extends SettingsActivity { /* empty */ }
+ public static class ZenModeAutomationSettingsActivity extends SettingsActivity { /* empty */ }
public static class NotificationSettingsActivity extends SettingsActivity { /* empty */ }
public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }
public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }