diff options
| author | John Spurlock <jspurlock@google.com> | 2014-10-28 11:21:42 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-10-28 12:57:43 -0400 |
| commit | c90e6fe863bb5ac84612bd777d3b352f69265950 (patch) | |
| tree | 693207989501ba2a3a270050442cf1cc4670a717 /packages/SystemUI/res/layout | |
| parent | 288f65e3811d17273085bc5c8b553f9ba8833dd4 (diff) | |
| download | frameworks_base-c90e6fe863bb5ac84612bd777d3b352f69265950.zip frameworks_base-c90e6fe863bb5ac84612bd777d3b352f69265950.tar.gz frameworks_base-c90e6fe863bb5ac84612bd777d3b352f69265950.tar.bz2 | |
Zen: Show "(until 4:56 PM)" in exit conditions.
Implement two-line exit conditions, display the duration + end
time on separate lines.
Bug: 16824863
Change-Id: I8dabc83042fce604ccb86b463b9bb547c7903c64
Diffstat (limited to 'packages/SystemUI/res/layout')
| -rw-r--r-- | packages/SystemUI/res/layout/zen_mode_condition.xml | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/packages/SystemUI/res/layout/zen_mode_condition.xml b/packages/SystemUI/res/layout/zen_mode_condition.xml index ad0d2dc..a9ad1fc 100644 --- a/packages/SystemUI/res/layout/zen_mode_condition.xml +++ b/packages/SystemUI/res/layout/zen_mode_condition.xml @@ -29,16 +29,34 @@ android:layout_alignParentStart="true" android:gravity="center" /> - <TextView - android:id="@android:id/title" + <LinearLayout + android:id="@android:id/content" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:orientation="vertical" android:layout_toEndOf="@android:id/checkbox" - android:layout_toStartOf="@android:id/button1" - android:ellipsize="end" - android:gravity="center_vertical" - android:maxLines="1" - android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary" /> + android:layout_toStartOf="@android:id/button1"> + + <TextView + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="end" + android:textAlignment="viewStart" + android:maxLines="1" + android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary" /> + + <TextView + android:id="@android:id/text2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="end" + android:textAlignment="viewStart" + android:maxLines="1" + android:textAppearance="@style/TextAppearance.QS.DetailItemSecondary" /> + + </LinearLayout> <ImageView android:id="@android:id/button1" |