Merge "An update on Downtime." (ec88e895) · Commits · e / os / android_frameworks_base

core/java/android/app/INotificationManager.aidl

+3 −5

Original line number	Diff line number	Diff line
		@@ -76,12 +76,10 @@ interface INotificationManager
		boolean matchesCallFilter(in Bundle extras);
		boolean isSystemConditionProviderEnabled(String path);

		int getZenMode();
		ZenModeConfig getZenModeConfig();
		boolean setZenModeConfig(in ZenModeConfig config);
		oneway void setZenMode(int mode);
		boolean setZenModeConfig(in ZenModeConfig config, String reason);
		oneway void setZenMode(int mode, in Uri conditionId, String reason);
		oneway void notifyConditions(String pkg, in IConditionProvider provider, in Condition[] conditions);
		oneway void requestZenModeConditions(in IConditionListener callback, int relevance);
		oneway void setZenModeCondition(in Condition condition);
		oneway void setAutomaticZenModeConditions(in Uri[] conditionIds);
		Condition[] getAutomaticZenModeConditions();
		}

core/java/android/app/NotificationManager.java

+21 −10

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.annotation.SdkConstant;
		import android.app.Notification.Builder;
		import android.content.ComponentName;
		import android.content.Context;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.IBinder;
		@@ -27,7 +28,7 @@ import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.StrictMode;
		import android.os.UserHandle;
		import android.service.notification.Condition;
		import android.provider.Settings.Global;
		import android.service.notification.IConditionListener;
		import android.service.notification.ZenModeConfig;
		import android.util.Log;
		@@ -282,14 +283,26 @@ public class NotificationManager
		/**
		* @hide
		*/
		public void setZenMode(int mode) {
		public void setZenMode(int mode, Uri conditionId, String reason) {
		INotificationManager service = getService();
		try {
		service.setZenMode(mode);
		service.setZenMode(mode, conditionId, reason);
		} catch (RemoteException e) {
		}
		}

		/**
		* @hide
		*/
		public boolean setZenModeConfig(ZenModeConfig config, String reason) {
		INotificationManager service = getService();
		try {
		return service.setZenModeConfig(config, reason);
		} catch (RemoteException e) {
		return false;
		}
		}

		/**
		* @hide
		*/
		@@ -304,24 +317,22 @@ public class NotificationManager
		/**
		* @hide
		*/
		public void setZenModeCondition(Condition exitCondition) {
		public int getZenMode() {
		INotificationManager service = getService();
		try {
		service.setZenModeCondition(exitCondition);
		return service.getZenMode();
		} catch (RemoteException e) {
		}
		return Global.ZEN_MODE_OFF;
		}

		/**
		* @hide
		*/
		public Condition getZenModeCondition() {
		public ZenModeConfig getZenModeConfig() {
		INotificationManager service = getService();
		try {
		final ZenModeConfig config = service.getZenModeConfig();
		if (config != null) {
		return config.exitCondition;
		}
		return service.getZenModeConfig();
		} catch (RemoteException e) {
		}
		return null;

core/java/android/provider/Settings.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -879,6 +879,15 @@ public final class Settings {
		public static final String ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE =
		"android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE";

		/**
		* Activity Action: Show Zen Mode schedule rule configuration settings.
		*
		* @hide
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS
		= "android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS";

		/**
		* Activity Action: Show the regulatory information screen for the device.
		* <p>
		@@ -7218,6 +7227,18 @@ public final class Settings {
		return "ZEN_MODE_OFF";
		}

		/** @hide */ public static boolean isValidZenMode(int value) {
		switch (value) {
		case Global.ZEN_MODE_OFF:
		case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
		case Global.ZEN_MODE_ALARMS:
		case Global.ZEN_MODE_NO_INTERRUPTIONS:
		return true;
		default:
		return false;
		}
		}

		/**
		* Opaque value, changes when persisted zen mode configuration changes.
		*

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

+468 −223

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,9 @@ import android.os.Build;
		*/
		public class MetricsLogger implements MetricsConstants {
		// These constants are temporary, they should migrate to MetricsConstants.
		// next value is 144;
		// next value is 145;

		public static final int NOTIFICATION_ZEN_MODE_SCHEDULE_RULE = 144;

		public static void visible(Context context, int category) throws IllegalArgumentException {
		if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) {