Merge "Fix tests" into pi-dev am: f22eb94b18

am: 878e66baa8

Change-Id: I9a24f5683ba339a5f874fac2bf7eca4daf22ac25
This commit is contained in:
Julia Reynolds
2018-03-12 22:06:53 +00:00
committed by android-build-merger

View File

@@ -105,6 +105,7 @@ import com.android.settings.notification.SoundSettings;
import com.android.settings.notification.ZenAccessSettings;
import com.android.settings.notification.ZenModeAutomationSettings;
import com.android.settings.notification.ZenModeBehaviorSettings;
import com.android.settings.notification.ZenModeBlockedEffectsSettings;
import com.android.settings.notification.ZenModeEventRuleSettings;
import com.android.settings.notification.ZenModeScheduleRuleSettings;
import com.android.settings.notification.ZenModeSettings;
@@ -220,6 +221,7 @@ public class SettingsGateway {
ZenModeBehaviorSettings.class.getName(),
ZenModeScheduleRuleSettings.class.getName(),
ZenModeEventRuleSettings.class.getName(),
ZenModeBlockedEffectsSettings.class.getName(),
ProcessStatsUi.class.getName(),
AdvancedPowerUsageDetail.class.getName(),
ProcessStatsSummary.class.getName(),