summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-05-13 15:42:04 -0400
committerJohn Spurlock <jspurlock@google.com>2015-05-13 15:45:40 -0400
commitbbde26774fcf7ea65abd92d60f7468478c015053 (patch)
treeb7e7b3ea1f4a91d681cea75f7b92a16fc7ff17b7 /packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
parenta7d92b19c048fe2b3115073286103e9194a915d6 (diff)
downloadframeworks_base-bbde26774fcf7ea65abd92d60f7468478c015053.zip
frameworks_base-bbde26774fcf7ea65abd92d60f7468478c015053.tar.gz
frameworks_base-bbde26774fcf7ea65abd92d60f7468478c015053.tar.bz2
Zen: Use shorter version of countdown condition summary in footer.
To try and keep to two-lines. Bug: 21119801 Change-Id: I5a6760381a6b673b8481164f92cf6b7b236af349
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java')
-rw-r--r--packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
index b3b6725..8dfa9b0 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
@@ -438,7 +438,8 @@ public class ZenModePanel extends LinearLayout {
final long span = time - now;
if (span <= 0 || span > MAX_BUCKET_MINUTES * MINUTES_MS) return null;
return ZenModeConfig.toTimeCondition(context,
- time, Math.round(span / (float) MINUTES_MS), now, ActivityManager.getCurrentUser());
+ time, Math.round(span / (float) MINUTES_MS), now, ActivityManager.getCurrentUser(),
+ false /*shortVersion*/);
}
private void handleUpdateConditions(Condition[] conditions) {
@@ -717,7 +718,8 @@ public class ZenModePanel extends LinearLayout {
if (up && bucketTime > time || !up && bucketTime < time) {
mBucketIndex = j;
newCondition = ZenModeConfig.toTimeCondition(mContext,
- bucketTime, bucketMinutes, now, ActivityManager.getCurrentUser());
+ bucketTime, bucketMinutes, now, ActivityManager.getCurrentUser(),
+ false /*shortVersion*/);
break;
}
}