diff options
| author | John Spurlock <jspurlock@google.com> | 2015-04-30 15:45:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 15:45:57 +0000 |
| commit | 5982d17a2623aa6ef7597acb43738d92803c7b43 (patch) | |
| tree | 454a81a42d21fffa11d3a107d8f992516e91539a /src/com/android/settings/SettingsActivity.java | |
| parent | d527f420860e8dfaa7fd87d0c53220fcd87ec5b6 (diff) | |
| parent | f57bad7d5b0f9044231fc52351ed27e14013f491 (diff) | |
| download | packages_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/SettingsActivity.java')
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 1ae923a..502f164 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -102,6 +102,7 @@ import com.android.settings.notification.NotificationAccessSettings; import com.android.settings.notification.NotificationSettings; import com.android.settings.notification.NotificationStation; import com.android.settings.notification.OtherSoundSettings; +import com.android.settings.notification.ZenModeEventRuleSettings; import com.android.settings.notification.ZenModeExternalRuleSettings; import com.android.settings.notification.ZenModePrioritySettings; import com.android.settings.notification.ZenModeSettings; @@ -343,6 +344,7 @@ public class SettingsActivity extends Activity WifiCallingSettings.class.getName(), ZenModePrioritySettings.class.getName(), ZenModeScheduleRuleSettings.class.getName(), + ZenModeEventRuleSettings.class.getName(), ZenModeExternalRuleSettings.class.getName(), ProcessStatsUi.class.getName(), }; |