Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jason Monk
2015-02-05 19:19:42 +00:00
committed by Android (Google) Code Review
parent f15f6a5087 867874b06a
commit 3bbc5a1134
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/qs_detail_item.xml
View File

@@ -39,6 +39,7 @@
android:id="@android:id/title" android:id="@android:id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end"
android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary" /> android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary" />
<TextView <TextView
@@ -58,4 +59,4 @@
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_qs_cancel" /> android:src="@drawable/ic_qs_cancel" />
</LinearLayout> </LinearLayout>

1
packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java
View File

@@ -190,6 +190,7 @@ public class QSDetailItems extends FrameLayout {
title.setText(item.line1); title.setText(item.line1);
final TextView summary = (TextView) view.findViewById(android.R.id.summary); final TextView summary = (TextView) view.findViewById(android.R.id.summary);
final boolean twoLines = !TextUtils.isEmpty(item.line2); final boolean twoLines = !TextUtils.isEmpty(item.line2);
title.setMaxLines(twoLines ? 1 : 2);
summary.setVisibility(twoLines ? VISIBLE : GONE); summary.setVisibility(twoLines ? VISIBLE : GONE);
summary.setText(twoLines ? item.line2 : null); summary.setText(twoLines ? item.line2 : null);
view.setMinimumHeight(mContext.getResources() .getDimensionPixelSize( view.setMinimumHeight(mContext.getResources() .getDimensionPixelSize(