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

Commit 3b98b3f1 authored by John Spurlock's avatar John Spurlock
Browse files

Implement long-term condition subscriptions. 

Bind long-term conditions (like "in a meeting") to enter/exit
zen mode automatically.

Persist automatic condition subscriptions to maintain them across
reboots.

Normalize condition state binding: true => enter zen, false => exit.

Change-Id: Icba2b8b25c0a352ae8215f4c0a324e4f966c0165
parent 5c5f4b70

core/java/android/app/INotificationManager.aidl

+3 −1
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ interface INotificationManager 
    ZenModeConfig getZenModeConfig();

    boolean setZenModeConfig(in ZenModeConfig config);

    oneway void notifyConditions(String pkg, in IConditionProvider provider, in Condition[] conditions);

    oneway void requestZenModeConditions(in IConditionListener callback, boolean requested);

    oneway void requestZenModeConditions(in IConditionListener callback, int relevance);

    oneway void setZenModeCondition(in Uri conditionId);

    oneway void setAutomaticZenModeConditions(in Uri[] conditionIds);

    Condition[] getAutomaticZenModeConditions();

}
 
 No newline at end of file

core/java/android/service/notification/Condition.java

+9 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class Condition implements Parcelable { 
        dest.writeParcelable(id, 0);

        dest.writeString(caption);

        dest.writeInt(state);

        dest.writeInt(flags);

        dest.writeInt(this.flags);

    }



    @Override
@@ -92,6 +92,14 @@ public class Condition implements Parcelable { 
        throw new IllegalArgumentException("state is invalid: " + state);

    }



    public static String relevanceToString(int flags) {

        final boolean now = (flags & FLAG_RELEVANT_NOW) != 0;

        final boolean always = (flags & FLAG_RELEVANT_ALWAYS) != 0;

        if (!now && !always) return "NONE";

        if (now && always) return "NOW, ALWAYS";

        return now ? "NOW" : "ALWAYS";

    }



    @Override

    public boolean equals(Object o) {

        if (!(o instanceof Condition)) return false;

core/java/android/service/notification/ZenModeConfig.java

+82 −4
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.service.notification;



import android.content.ComponentName;

import android.net.Uri;

import android.os.Parcel;

import android.os.Parcelable;

import android.text.TextUtils;
@@ -25,6 +27,8 @@ import org.xmlpull.v1.XmlPullParserException; 
import org.xmlpull.v1.XmlSerializer;



import java.io.IOException;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Objects;



/**
@@ -51,6 +55,10 @@ public class ZenModeConfig implements Parcelable { 
    private static final String SLEEP_ATT_END_HR = "endHour";

    private static final String SLEEP_ATT_END_MIN = "endMin";



    private static final String CONDITION_TAG = "condition";

    private static final String CONDITION_ATT_COMPONENT = "component";

    private static final String CONDITION_ATT_ID = "id";



    public boolean allowCalls;

    public boolean allowMessages;
@@ -59,6 +67,8 @@ public class ZenModeConfig implements Parcelable { 
    public int sleepStartMinute;

    public int sleepEndHour;

    public int sleepEndMinute;

    public ComponentName[] conditionComponents;

    public Uri[] conditionIds;



    public ZenModeConfig() { }
@@ -72,6 +82,16 @@ public class ZenModeConfig implements Parcelable { 
        sleepStartMinute = source.readInt();

        sleepEndHour = source.readInt();

        sleepEndMinute = source.readInt();

        int len = source.readInt();

        if (len > 0) {

            conditionComponents = new ComponentName[len];

            source.readTypedArray(conditionComponents, ComponentName.CREATOR);

        }

        len = source.readInt();

        if (len > 0) {

            conditionIds = new Uri[len];

            source.readTypedArray(conditionIds, Uri.CREATOR);

        }

    }



    @Override
@@ -88,6 +108,18 @@ public class ZenModeConfig implements Parcelable { 
        dest.writeInt(sleepStartMinute);

        dest.writeInt(sleepEndHour);

        dest.writeInt(sleepEndMinute);

        if (conditionComponents != null && conditionComponents.length > 0) {

            dest.writeInt(conditionComponents.length);

            dest.writeTypedArray(conditionComponents, 0);

        } else {

            dest.writeInt(0);

        }

        if (conditionIds != null && conditionIds.length > 0) {

            dest.writeInt(conditionIds.length);

            dest.writeTypedArray(conditionIds, 0);

        } else {

            dest.writeInt(0);

        }

    }



    @Override
@@ -98,6 +130,10 @@ public class ZenModeConfig implements Parcelable { 
            .append(",sleepMode=").append(sleepMode)

            .append(",sleepStart=").append(sleepStartHour).append('.').append(sleepStartMinute)

            .append(",sleepEnd=").append(sleepEndHour).append('.').append(sleepEndMinute)

            .append(",conditionComponents=")

            .append(conditionComponents == null ? null : TextUtils.join(",", conditionComponents))

            .append(",conditionIds=")

            .append(conditionIds == null ? null : TextUtils.join(",", conditionIds))

            .append(']').toString();

    }
@@ -112,13 +148,16 @@ public class ZenModeConfig implements Parcelable { 
                && other.sleepStartHour == sleepStartHour

                && other.sleepStartMinute == sleepStartMinute

                && other.sleepEndHour == sleepEndHour

                && other.sleepEndMinute == sleepEndMinute;

                && other.sleepEndMinute == sleepEndMinute

                && Objects.deepEquals(other.conditionComponents, conditionComponents)

                && Objects.deepEquals(other.conditionIds, conditionIds);

    }



    @Override

    public int hashCode() {

        return Objects.hash(allowCalls, allowMessages, sleepMode, sleepStartHour,

                sleepStartMinute, sleepEndHour, sleepEndMinute);

                sleepStartMinute, sleepEndHour, sleepEndMinute,

                Arrays.hashCode(conditionComponents), Arrays.hashCode(conditionIds));

    }



    public boolean isValid() {
@@ -136,9 +175,18 @@ public class ZenModeConfig implements Parcelable { 
        if (!ZEN_TAG.equals(tag)) return null;

        final ZenModeConfig rt = new ZenModeConfig();

        final int version = Integer.parseInt(parser.getAttributeValue(null, ZEN_ATT_VERSION));

        final ArrayList<ComponentName> conditionComponents = new ArrayList<ComponentName>();

        final ArrayList<Uri> conditionIds = new ArrayList<Uri>();

        while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) {

            tag = parser.getName();

            if (type == XmlPullParser.END_TAG && ZEN_TAG.equals(tag)) return rt;

            if (type == XmlPullParser.END_TAG && ZEN_TAG.equals(tag)) {

                if (!conditionComponents.isEmpty()) {

                    rt.conditionComponents = conditionComponents

                            .toArray(new ComponentName[conditionComponents.size()]);

                    rt.conditionIds = conditionIds.toArray(new Uri[conditionIds.size()]);

                }

                return rt;

            }

            if (type == XmlPullParser.START_TAG) {

                if (ALLOW_TAG.equals(tag)) {

                    rt.allowCalls = safeBoolean(parser, ALLOW_ATT_CALLS, false);
@@ -155,10 +203,18 @@ public class ZenModeConfig implements Parcelable { 
                    rt.sleepStartMinute = isValidMinute(startMinute) ? startMinute : 0;

                    rt.sleepEndHour = isValidHour(endHour) ? endHour : 0;

                    rt.sleepEndMinute = isValidMinute(endMinute) ? endMinute : 0;

                } else if (CONDITION_TAG.equals(tag)) {

                    final ComponentName component =

                            safeComponentName(parser, CONDITION_ATT_COMPONENT);

                    final Uri conditionId = safeUri(parser, CONDITION_ATT_ID);

                    if (component != null && conditionId != null) {

                        conditionComponents.add(component);

                        conditionIds.add(conditionId);

                    }

                }

            }

        return rt;

        }

        throw new IllegalStateException("Failed to reach END_DOCUMENT");

    }



    public void writeXml(XmlSerializer out) throws IOException {
@@ -180,6 +236,16 @@ public class ZenModeConfig implements Parcelable { 
        out.attribute(null, SLEEP_ATT_END_MIN, Integer.toString(sleepEndMinute));

        out.endTag(null, SLEEP_TAG);



        if (conditionComponents != null && conditionIds != null

                && conditionComponents.length == conditionIds.length) {

            for (int i = 0; i < conditionComponents.length; i++) {

                out.startTag(null, CONDITION_TAG);

                out.attribute(null, CONDITION_ATT_COMPONENT,

                        conditionComponents[i].flattenToString());

                out.attribute(null, CONDITION_ATT_ID, conditionIds[i].toString());

                out.endTag(null, CONDITION_TAG);

            }

        }

        out.endTag(null, ZEN_TAG);

    }
@@ -203,6 +269,18 @@ public class ZenModeConfig implements Parcelable { 
        return Integer.valueOf(val);

    }



    private static ComponentName safeComponentName(XmlPullParser parser, String att) {

        final String val = parser.getAttributeValue(null, att);

        if (TextUtils.isEmpty(val)) return null;

        return ComponentName.unflattenFromString(val);

    }



    private static Uri safeUri(XmlPullParser parser, String att) {

        final String val = parser.getAttributeValue(null, att);

        if (TextUtils.isEmpty(val)) return null;

        return Uri.parse(val);

    }



    @Override

    public int describeContents() {

        return 0;

packages/SystemUI/src/com/android/systemui/statusbar/phone/ZenModeViewAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public abstract class ZenModeViewAdapter implements ZenModeView.Adapter { 
        mNoMan = INotificationManager.Stub.asInterface(

                ServiceManager.getService(Context.NOTIFICATION_SERVICE));

        try {

            mNoMan.requestZenModeConditions(mListener, true /*requested*/);

            mNoMan.requestZenModeConditions(mListener, Condition.FLAG_RELEVANT_NOW);

        } catch (RemoteException e) {

            // noop

        }
@@ -98,7 +98,7 @@ public abstract class ZenModeViewAdapter implements ZenModeView.Adapter { 
    @Override

    public void dispose() {

        try {

            mNoMan.requestZenModeConditions(mListener, false /*requested*/);

            mNoMan.requestZenModeConditions(mListener, 0 /*none*/);

        } catch (RemoteException e) {

            // noop

        }

services/core/java/com/android/server/notification/ConditionProviders.java

+300 −88

File changed.

Preview size limit exceeded, changes collapsed.