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

Merge "Ellipsize long QS labels." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-25 16:56:37 +00:00
committed by Android (Google) Code Review
parent 5d8dfe17c8 f180ffd03e
commit 1848f1e384
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/layout/qs_tile_label.xml
View File

@@ -41,7 +41,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:maxLines="2"
android:padding="0dp"
android:gravity="center"
android:ellipsize="marquee"

8
packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileView.java
View File

@@ -36,6 +36,7 @@ import java.util.Objects;
/** View that represents a standard quick settings tile. **/
public class QSTileView extends QSTileBaseView {
private static final int MAX_LABEL_LINES = 2;
private static final boolean DUAL_TARGET_ALLOWED = false;
private View mDivider;
protected TextView mLabel;
@@ -98,9 +99,10 @@ public class QSTileView extends QSTileBaseView {
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
// Remeasure view if the secondary label text will be cut off.
if (!TextUtils.isEmpty(mSecondLine.getText())
&& mSecondLine.getLineHeight() > mSecondLine.getHeight()) {
// Remeasure view if the primary label requires more then 2 lines or the secondary label
// text will be cut off.
if (mLabel.getLineCount() > MAX_LABEL_LINES || !TextUtils.isEmpty(mSecondLine.getText())
&& mSecondLine.getLineHeight() > mSecondLine.getHeight()) {
mLabel.setSingleLine();
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
}