summaryrefslogtreecommitdiffstats
path: root/core/java/android/service
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-11-29 13:22:21 -0500
committerJohn Spurlock <jspurlock@google.com>2014-11-30 10:41:33 -0500
commit3e0770163686c1be83959d681976dafaf25272e1 (patch)
tree7b8d80677ed8eb507e577b93237c4e579759ba98 /core/java/android/service
parentc1de25d8ebaecff697c1d5dfaa445e18ee07fa2d (diff)
downloadframeworks_base-3e0770163686c1be83959d681976dafaf25272e1.zip
frameworks_base-3e0770163686c1be83959d681976dafaf25272e1.tar.gz
frameworks_base-3e0770163686c1be83959d681976dafaf25272e1.tar.bz2
Zen: Improve zen mode panel condition selection.
- Decouple condition requests from expansion, now pre-request when zen panel unhidden. - Animate zen mode panel expansion. - Improve default selection logic, ensure something is selected as soon as we are in the expanded state. - Tweak visual spacing. - Map null condition to Indef properly when we start out in zen. - Avoid unnecessary condition teardown when the conditions are updated but unchanged from current. - Cap number of optional conditions to display, default=3. Bug: 18335618 Change-Id: I007b7c3b2e75e2b42805af240684aa8581e9951a
Diffstat (limited to 'core/java/android/service')
-rw-r--r--core/java/android/service/notification/Condition.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/service/notification/Condition.java b/core/java/android/service/notification/Condition.java
index 3a91d1a..80bdbf1 100644
--- a/core/java/android/service/notification/Condition.java
+++ b/core/java/android/service/notification/Condition.java
@@ -160,7 +160,7 @@ public class Condition implements Parcelable {
}
public static boolean isValidId(Uri id, String pkg) {
- return id != null && id.getScheme().equals(SCHEME) && id.getAuthority().equals(pkg);
+ return id != null && SCHEME.equals(id.getScheme()) && pkg.equals(id.getAuthority());
}
public static final Parcelable.Creator<Condition> CREATOR