Settings: External automatic rule settings.
- Add external automatic rule settings page with the common
settings for all rules (enabled, name, zen mode).
- Pull common rule-instance settings into settings base class, share
with existing schedule rule settings.
- New page not searchable since it is at the rule-instance level.
- Obtain external rule information from existing conditions provider
metadata. Includes rule type caption, sub-configuration activity,
and default condition id.
- If external condition providers exist with the appropriate metadata,
display the external rule types as options in the new rule dialog.
(max of 3 external types)
- Pull common managed service listing code out of common settings base
class and into a more reusable helper class.
Bug: 20064962
Change-Id: Ibc13607490b7312a7d9f7f3bd61c3cfcf71a2794
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 7bfd249..0fdf04b 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -95,11 +95,11 @@
import com.android.settings.nfc.AndroidBeam;
import com.android.settings.nfc.PaymentSettings;
import com.android.settings.notification.AppNotificationSettings;
-import com.android.settings.notification.ConditionProviderSettings;
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.ZenModeExternalRuleSettings;
import com.android.settings.notification.ZenModeSettings;
import com.android.settings.notification.ZenModeScheduleRuleSettings;
import com.android.settings.print.PrintJobSettingsFragment;
@@ -320,7 +320,6 @@
DreamSettings.class.getName(),
UserSettings.class.getName(),
NotificationAccessSettings.class.getName(),
- ConditionProviderSettings.class.getName(),
PrintSettingsFragment.class.getName(),
PrintJobSettingsFragment.class.getName(),
TrustedCredentialsSettings.class.getName(),
@@ -337,6 +336,7 @@
ApnSettings.class.getName(),
WifiCallingSettings.class.getName(),
ZenModeScheduleRuleSettings.class.getName(),
+ ZenModeExternalRuleSettings.class.getName(),
};