diff options
| author | Jason Monk <jmonk@google.com> | 2015-02-05 19:39:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-05 19:39:18 +0000 |
| commit | 6d72d46b4b6fe0ec72c24ea5369c6d92fd29ba52 (patch) | |
| tree | af5731f5dcea94cf3e678269c60fa0d2a89a1792 /packages/SystemUI | |
| parent | f1a4d0e864f17c59c0e292e8f1161ab4397e5ba4 (diff) | |
| parent | 3bbc5a113403886b16d276f2438677c5381bfab6 (diff) | |
| download | frameworks_base-6d72d46b4b6fe0ec72c24ea5369c6d92fd29ba52.zip frameworks_base-6d72d46b4b6fe0ec72c24ea5369c6d92fd29ba52.tar.gz frameworks_base-6d72d46b4b6fe0ec72c24ea5369c6d92fd29ba52.tar.bz2 | |
am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev
* commit '3bbc5a113403886b16d276f2438677c5381bfab6':
Ellipsize QS detail items when needed
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/res/layout/qs_detail_item.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/res/layout/qs_detail_item.xml b/packages/SystemUI/res/layout/qs_detail_item.xml index ea2e1e1..0ba3ba3 100644 --- a/packages/SystemUI/res/layout/qs_detail_item.xml +++ b/packages/SystemUI/res/layout/qs_detail_item.xml @@ -39,6 +39,7 @@ android:id="@android:id/title" android:layout_width="match_parent" android:layout_height="wrap_content" + android:ellipsize="end" android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary" /> <TextView @@ -58,4 +59,4 @@ android:scaleType="center" android:src="@drawable/ic_qs_cancel" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java b/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java index 9155102..95ac558 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java @@ -190,6 +190,7 @@ public class QSDetailItems extends FrameLayout { title.setText(item.line1); final TextView summary = (TextView) view.findViewById(android.R.id.summary); final boolean twoLines = !TextUtils.isEmpty(item.line2); + title.setMaxLines(twoLines ? 1 : 2); summary.setVisibility(twoLines ? VISIBLE : GONE); summary.setText(twoLines ? item.line2 : null); view.setMinimumHeight(mContext.getResources() .getDimensionPixelSize( |