diff options
| author | John Spurlock <jspurlock@google.com> | 2015-04-03 23:53:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-03 23:53:07 +0000 |
| commit | 552d56348f0e942d240b8de41581d49cc05113c0 (patch) | |
| tree | 5680070d4aaf694d7e6cf6fd20d14827e699c026 | |
| parent | 88dc5ba692f588e27efaa748a227304052490e45 (diff) | |
| parent | 7af10188c0525d5a3ab8a1883ce621fe4d333070 (diff) | |
| download | frameworks_base-552d56348f0e942d240b8de41581d49cc05113c0.zip frameworks_base-552d56348f0e942d240b8de41581d49cc05113c0.tar.gz frameworks_base-552d56348f0e942d240b8de41581d49cc05113c0.tar.bz2 | |
Merge "Zen: Changes to support new automation settings sub-section."
| -rw-r--r-- | core/java/android/provider/Settings.java | 9 | ||||
| -rw-r--r-- | core/java/com/android/internal/logging/MetricsLogger.java | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 8832895..bf9a1ad 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -848,6 +848,15 @@ public final class Settings { = "android.settings.ZEN_MODE_PRIORITY_SETTINGS"; /** + * Activity Action: Show Zen Mode automation configuration settings. + * + * @hide + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_ZEN_MODE_AUTOMATION_SETTINGS + = "android.settings.ZEN_MODE_AUTOMATION_SETTINGS"; + + /** * Activity Action: Show the regulatory information screen for the device. * <p> * In some cases, a matching Activity may not exist, so ensure you safeguard diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java index 50d252b..1038543 100644 --- a/core/java/com/android/internal/logging/MetricsLogger.java +++ b/core/java/com/android/internal/logging/MetricsLogger.java @@ -40,6 +40,7 @@ public class MetricsLogger implements MetricsConstants { public static final int MANAGE_PERMISSIONS = 142; public static final int NOTIFICATION_ZEN_MODE_PRIORITY = 143; + public static final int NOTIFICATION_ZEN_MODE_AUTOMATION = 144; public static final int MANAGE_DOMAIN_URLS = 143; |