diff options
| author | John Spurlock <jspurlock@google.com> | 2014-12-01 19:46:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-01 19:46:50 +0000 |
| commit | f1832e2444d746dae25e64e4f91bd1dc6d2329ce (patch) | |
| tree | 981e1646d5f30e0a5eeb473f1151a03bbfff13d4 /packages/SystemUI/res | |
| parent | 53da315f1d27885a94fc5435e2593ce7d48f29a9 (diff) | |
| parent | 64e034e351ad73b9cb99cb04511d0fea137c7a3b (diff) | |
| download | frameworks_base-f1832e2444d746dae25e64e4f91bd1dc6d2329ce.zip frameworks_base-f1832e2444d746dae25e64e4f91bd1dc6d2329ce.tar.gz frameworks_base-f1832e2444d746dae25e64e4f91bd1dc6d2329ce.tar.bz2 | |
am 64e034e3: am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev
* commit '64e034e351ad73b9cb99cb04511d0fea137c7a3b':
Zen: Improve zen mode panel condition selection.
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/zen_mode_condition.xml | 7 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/zen_mode_panel.xml | 6 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 10 |
4 files changed, 22 insertions, 4 deletions
diff --git a/packages/SystemUI/res/layout/zen_mode_condition.xml b/packages/SystemUI/res/layout/zen_mode_condition.xml index a9ad1fc..0b91913 100644 --- a/packages/SystemUI/res/layout/zen_mode_condition.xml +++ b/packages/SystemUI/res/layout/zen_mode_condition.xml @@ -17,14 +17,15 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="@dimen/qs_detail_item_height" + android:layout_marginBottom="@dimen/zen_mode_condition_detail_item_spacing" android:layout_marginStart="@dimen/zen_mode_condition_detail_button_padding" android:layout_marginEnd="@dimen/zen_mode_condition_detail_button_padding" > <RadioButton android:id="@android:id/checkbox" android:layout_width="40dp" - android:layout_marginStart="2dp" - android:layout_marginEnd="1dp" + android:layout_marginStart="7dp" + android:layout_marginEnd="4dp" android:layout_height="match_parent" android:layout_alignParentStart="true" android:gravity="center" /> @@ -51,6 +52,7 @@ android:id="@android:id/text2" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/zen_mode_condition_detail_item_interline_spacing" android:ellipsize="end" android:textAlignment="viewStart" android:maxLines="1" @@ -64,7 +66,6 @@ android:layout_width="48dp" android:layout_height="48dp" android:layout_centerVertical="true" - android:layout_marginEnd="@dimen/zen_mode_condition_detail_button_padding" android:scaleType="center" android:layout_toStartOf="@android:id/button2" android:contentDescription="@string/accessibility_quick_settings_less_time" diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml index f2dc402..922f90d 100644 --- a/packages/SystemUI/res/layout/zen_mode_panel.xml +++ b/packages/SystemUI/res/layout/zen_mode_panel.xml @@ -58,6 +58,8 @@ android:background="@drawable/btn_borderless_rect" android:clickable="true" android:drawableEnd="@drawable/qs_subhead_caret" + android:maxLines="2" + android:ellipsize="end" android:textAppearance="@style/TextAppearance.QS.Subhead" /> <TextView @@ -67,6 +69,8 @@ android:layout_gravity="center_vertical" android:gravity="center_vertical" android:paddingLeft="8dp" + android:maxLines="2" + android:ellipsize="end" android:textAppearance="@style/TextAppearance.QS.Subhead" /> <ImageView @@ -87,6 +91,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingBottom="@dimen/qs_panel_padding" /> + android:paddingBottom="@dimen/zen_mode_condition_detail_bottom_padding" /> </com.android.systemui.volume.ZenModePanel> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index b299f35..9a95b37 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -278,6 +278,9 @@ <!-- Number of times to show the strong alarm warning text in the volume dialog --> <integer name="zen_mode_alarm_warning_threshold">5</integer> + <!-- Maximum number of optional conditions to display in the zen mode selection panel --> + <integer name="zen_mode_max_conditions">3</integer> + <!-- Enable the default volume dialog --> <bool name="enable_volume_ui">true</bool> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 1143553..68a7622 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -197,8 +197,18 @@ <!-- How far the expanded QS panel peeks from the header in collapsed state. --> <dimen name="qs_peek_height">8dp</dimen> + <!-- Zen mode panel: condition item button padding --> <dimen name="zen_mode_condition_detail_button_padding">8dp</dimen> + <!-- Zen mode panel: spacing between condition items --> + <dimen name="zen_mode_condition_detail_item_spacing">12dp</dimen> + + <!-- Zen mode panel: spacing between two-line condition upper and lower lines --> + <dimen name="zen_mode_condition_detail_item_interline_spacing">4dp</dimen> + + <!-- Zen mode panel: bottom padding, a bit less than qs_panel_padding --> + <dimen name="zen_mode_condition_detail_bottom_padding">4dp</dimen> + <!-- used by DessertCase --> <dimen name="dessert_case_cell_size">192dp</dimen> |