Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 552d5634 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

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

parents 88dc5ba6 7af10188

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -847,6 +847,15 @@ public final class Settings { 
    public static final String ACTION_ZEN_MODE_PRIORITY_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>

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

+1 −0
Original line number Diff line number Diff line
@@ -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;