commit 7af10188c0525d5a3ab8a1883ce621fe4d333070
author John Spurlock <jspurlock@google.com> Fri Apr 03 15:10:31 2015 -0400
committer John Spurlock <jspurlock@google.com> Fri Apr 03 16:05:22 2015 -0400
tree 8685365354995b106dafe0f6c25229b9e8fd21fa
parent fc746f8ac5ea74747a502d4a75161a46f9cb892d

Zen: Changes to support new automation settings sub-section.

Bug: 20064962
Change-Id: I1da5bd1f8ef52a070b8225da4b761979f290df77

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index e5c9859..1d6f933f 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -848,6 +848,15 @@
             = "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

core/java/com/android/internal/logging/MetricsLogger.java

diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java
index 740522a..e9e3983 100644
--- a/core/java/com/android/internal/logging/MetricsLogger.java
+++ b/core/java/com/android/internal/logging/MetricsLogger.java
@@ -40,6 +40,7 @@
 
     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 void visible(Context context, int category) throws IllegalArgumentException {
         if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) {