PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Settings: Do not disturb automatic rule updates." into mnc-dev

Browse Source
This commit is contained in:
John Spurlock
2015-04-30 15:45:53 +00:00
committed by Android (Google) Code Review
parent d527f42086 f57bad7d5b
commit 5982d17a26
16 changed files with 579 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/SettingsActivity.java
View File

@@ -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(),
};