diff options
| author | John Spurlock <jspurlock@google.com> | 2015-06-02 17:52:46 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2015-06-02 17:56:28 -0400 |
| commit | 023544f762a835fa903088cb38abda31aa09bed5 (patch) | |
| tree | 681dbf8bdfb7e433f810194674198df273e1b29d /packages/SystemUI/src/com/android/systemui/volume | |
| parent | a58b9a2c06e6b0143a28cc3bf86d3f003c69b559 (diff) | |
| download | frameworks_base-023544f762a835fa903088cb38abda31aa09bed5.zip frameworks_base-023544f762a835fa903088cb38abda31aa09bed5.tar.gz frameworks_base-023544f762a835fa903088cb38abda31aa09bed5.tar.bz2 | |
Volume footer uglification.
- Move "End now" button to its own line, below the condition lines.
- Add the feature name "Do Not Disturb" to the condition summary
for the indef condition.
- Fix found RTL issues with the footer.
Bug: 21171893
Change-Id: Ia12fe57d46a5547beec82cf76e175982bfa3fd6c
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/volume')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java index 6d67d11..3f6294d 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java @@ -126,8 +126,12 @@ public class ZenFooter extends LinearLayout { : null; Util.setText(mSummaryLine1, line1); - final String line2 = ZenModeConfig.getConditionSummary(mContext, mConfig, - mController.getCurrentUser(), true /*shortVersion*/); + final boolean isForever = mConfig != null && mConfig.manualRule != null + && mConfig.manualRule.conditionId == null; + final String line2 = + isForever ? mContext.getString(com.android.internal.R.string.zen_mode_forever_dnd) + : ZenModeConfig.getConditionSummary(mContext, mConfig, mController.getCurrentUser(), + true /*shortVersion*/); Util.setText(mSummaryLine2, line2); } |