From bbde26774fcf7ea65abd92d60f7468478c015053 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Wed, 13 May 2015 15:42:04 -0400 Subject: Zen: Use shorter version of countdown condition summary in footer. To try and keep to two-lines. Bug: 21119801 Change-Id: I5a6760381a6b673b8481164f92cf6b7b236af349 --- packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java | 2 +- packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java index 66c4993..6d67d11 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java @@ -127,7 +127,7 @@ public class ZenFooter extends LinearLayout { Util.setText(mSummaryLine1, line1); final String line2 = ZenModeConfig.getConditionSummary(mContext, mConfig, - mController.getCurrentUser()); + mController.getCurrentUser(), true /*shortVersion*/); Util.setText(mSummaryLine2, line2); } 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; } } -- cgit v1.1