summaryrefslogtreecommitdiffstats
path: root/core/java/android/service
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-11-03 11:01:51 -0500
committerJohn Spurlock <jspurlock@google.com>2014-11-05 08:46:01 -0500
commit37bc92cc2332eb6f864977381135c19d6a081a92 (patch)
treec563109a324acd911f3ca8b50e09c6090ef36772 /core/java/android/service
parent18b055e106d5452ef390716d3ea8d1641a225361 (diff)
downloadframeworks_base-37bc92cc2332eb6f864977381135c19d6a081a92.zip
frameworks_base-37bc92cc2332eb6f864977381135c19d6a081a92.tar.gz
frameworks_base-37bc92cc2332eb6f864977381135c19d6a081a92.tar.bz2
Zen: Create a new exit condition for "next alarm".
- If the user's next alarm is in the next 12 hrs, provide this as an exit condition trigger for leaving none/priority. - Don't display the next alarm condition when downtime is active. - When the next-alarm exit condition is active, follow changes to the next alarm, assuming it remains within the 12-hr window. - Tweak the downtime condition strings to be consistent. Bug: 16373455 Change-Id: I4020b91d323dead998e62d655132eca07438b148
Diffstat (limited to 'core/java/android/service')
-rw-r--r--core/java/android/service/notification/ZenModeConfig.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java
index 9a84a1e..9fb3535 100644
--- a/core/java/android/service/notification/ZenModeConfig.java
+++ b/core/java/android/service/notification/ZenModeConfig.java
@@ -498,7 +498,7 @@ public class ZenModeConfig implements Parcelable {
}
// For built-in conditions
- private static final String SYSTEM_AUTHORITY = "android";
+ public static final String SYSTEM_AUTHORITY = "android";
// Built-in countdown conditions, e.g. condition://android/countdown/1399917958951
private static final String COUNTDOWN_PATH = "countdown";