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

Merge "Also update setMinLines" into nyc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2016-06-02 19:34:56 +00:00
committed by Android (Google) Code Review
parent a31ac7ddfb b6650bf02d
commit 79c0b2bcbb
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/qs/customize/CustomizeTileView.java
View File

@@ -26,7 +26,7 @@ import libcore.util.Objects;
public class CustomizeTileView extends QSTileView { public class CustomizeTileView extends QSTileView {
private TextView mAppLabel; private TextView mAppLabel;
private int mLabelMinLines;
public CustomizeTileView(Context context, QSIconView icon) { public CustomizeTileView(Context context, QSIconView icon) {
super(context, icon); super(context, icon);
} }
@@ -34,6 +34,7 @@ public class CustomizeTileView extends QSTileView {
@Override @Override
protected void createLabel() { protected void createLabel() {
super.createLabel(); super.createLabel();
mLabelMinLines = mLabel.getMinLines();
View view = LayoutInflater.from(mContext).inflate(R.layout.qs_tile_label, null); View view = LayoutInflater.from(mContext).inflate(R.layout.qs_tile_label, null);
mAppLabel = (TextView) view.findViewById(R.id.tile_label); mAppLabel = (TextView) view.findViewById(R.id.tile_label);
mAppLabel.setAlpha(.6f); mAppLabel.setAlpha(.6f);
@@ -44,6 +45,9 @@ public class CustomizeTileView extends QSTileView {
public void setShowAppLabel(boolean showAppLabel) { public void setShowAppLabel(boolean showAppLabel) {
mAppLabel.setVisibility(showAppLabel ? View.VISIBLE : View.GONE); mAppLabel.setVisibility(showAppLabel ? View.VISIBLE : View.GONE);
mLabel.setSingleLine(showAppLabel); mLabel.setSingleLine(showAppLabel);
if (!showAppLabel) {
mLabel.setMinLines(mLabelMinLines);
}
} }
public void setAppLabel(CharSequence label) { public void setAppLabel(CharSequence label) {