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

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

Merge "Zen: Add a new level: alarms-only."

parents f8515ea4 4f1163c8

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28074,6 +28074,7 @@ package android.service.notification { 
    method public final void requestInterruptionFilter(int);

    method public final void requestListenerHints(int);

    field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1

    field public static final int INTERRUPTION_FILTER_ALARMS = 4; // 0x4

    field public static final int INTERRUPTION_FILTER_ALL = 1; // 0x1

    field public static final int INTERRUPTION_FILTER_NONE = 3; // 0x3

    field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30102,6 +30102,7 @@ package android.service.notification { 
    method public final void setOnNotificationPostedTrim(int);

    method public void unregisterAsSystemService() throws android.os.RemoteException;

    field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1

    field public static final int INTERRUPTION_FILTER_ALARMS = 4; // 0x4

    field public static final int INTERRUPTION_FILTER_ALL = 1; // 0x1

    field public static final int INTERRUPTION_FILTER_NONE = 3; // 0x3

    field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2

core/java/android/provider/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -7110,9 +7110,11 @@ public final class Settings { 
        /** @hide */ public static final int ZEN_MODE_OFF = 0;

        /** @hide */ public static final int ZEN_MODE_IMPORTANT_INTERRUPTIONS = 1;

        /** @hide */ public static final int ZEN_MODE_NO_INTERRUPTIONS = 2;

        /** @hide */ public static final int ZEN_MODE_ALARMS = 3;



        /** @hide */ public static String zenModeToString(int mode) {

            if (mode == ZEN_MODE_IMPORTANT_INTERRUPTIONS) return "ZEN_MODE_IMPORTANT_INTERRUPTIONS";

            if (mode == ZEN_MODE_ALARMS) return "ZEN_MODE_ALARMS";

            if (mode == ZEN_MODE_NO_INTERRUPTIONS) return "ZEN_MODE_NO_INTERRUPTIONS";

            return "ZEN_MODE_OFF";

        }

core/java/android/service/notification/NotificationListenerService.java

+6 −0
Original line number Diff line number Diff line
@@ -77,6 +77,12 @@ public abstract class NotificationListenerService extends Service { 
     */

    public static final int INTERRUPTION_FILTER_NONE = 3;



    /**

     * {@link #getCurrentInterruptionFilter() Interruption filter} constant -

     *     Alarms only interruption filter.

     */

    public static final int INTERRUPTION_FILTER_ALARMS = 4;



    /** {@link #getCurrentInterruptionFilter() Interruption filter} constant - returned when

     * the value is unavailable for any reason.  For example, before the notification listener

     * is connected.

packages/SystemUI/res/layout/segmented_button.xml

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ 
    android:layout_height="wrap_content"

    android:layout_marginStart="@dimen/segmented_button_spacing"

    android:layout_weight="1"

    android:gravity="center"

    android:paddingStart="8dp"

    android:gravity="start|center_vertical"

    android:maxLines="2"

    android:textColor="@color/segmented_button_text_selector"

    android:background="@drawable/btn_borderless_rect"

    android:textAppearance="@style/TextAppearance.Volume.ZenSwitchSummary"