diff options
| author | Jason Monk <jmonk@google.com> | 2015-06-17 13:02:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-17 13:02:22 +0000 |
| commit | f858f7034c911c1a4dc45daa6e80ee0f9925e008 (patch) | |
| tree | 6b7d81bce2cbd10b5b8bf71ed54dd409edbd379c | |
| parent | 2c89e7d8dba1713de17157a164071c65f4b00915 (diff) | |
| parent | caceba8b9f49733891e5458caf3e6ea2de3a1574 (diff) | |
| download | frameworks_base-f858f7034c911c1a4dc45daa6e80ee0f9925e008.zip frameworks_base-f858f7034c911c1a4dc45daa6e80ee0f9925e008.tar.gz frameworks_base-f858f7034c911c1a4dc45daa6e80ee0f9925e008.tar.bz2 | |
Merge "Allow QS detail items to get bigger when text is large" into mnc-dev
| -rw-r--r-- | packages/SystemUI/res/layout/qs_detail_item.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/packages/SystemUI/res/layout/qs_detail_item.xml b/packages/SystemUI/res/layout/qs_detail_item.xml index 0ba3ba3..a519d3f 100644 --- a/packages/SystemUI/res/layout/qs_detail_item.xml +++ b/packages/SystemUI/res/layout/qs_detail_item.xml @@ -16,7 +16,8 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="@dimen/qs_detail_item_height" + android:layout_height="wrap_content" + android:minHeight="@dimen/qs_detail_item_height" android:background="@drawable/btn_borderless_rect" android:clickable="true" android:gravity="center_vertical" diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 3760188..b0e71f9 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -178,7 +178,6 @@ <dimen name="qs_tile_spacing">4dp</dimen> <dimen name="qs_panel_padding_bottom">8dp</dimen> <dimen name="qs_detail_item_height">48dp</dimen> - <dimen name="qs_detail_item_height_twoline">72dp</dimen> <dimen name="qs_brightness_padding_top">6dp</dimen> <dimen name="qs_detail_header_text_size">20sp</dimen> <dimen name="qs_detail_button_text_size">14sp</dimen> diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java b/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java index 2a44e56..25b9105 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java @@ -193,8 +193,6 @@ public class QSDetailItems extends FrameLayout { title.setMaxLines(twoLines ? 1 : 2); summary.setVisibility(twoLines ? VISIBLE : GONE); summary.setText(twoLines ? item.line2 : null); - view.setMinimumHeight(mContext.getResources() .getDimensionPixelSize( - twoLines ? R.dimen.qs_detail_item_height_twoline : R.dimen.qs_detail_item_height)); view.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { |