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 
am: 79c0b2bcbb

* commit '79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
  Also update setMinLines

Change-Id: I34792f349b421e20849ad1db2a28d2751c994189
This commit is contained in:
Jorim Jaggi
2016-06-02 19:45:09 +00:00
committed by android-build-merger
parent f584b1d96d 79c0b2bcbb
commit 8524697351
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 {
private TextView mAppLabel;
private int mLabelMinLines;
public CustomizeTileView(Context context, QSIconView icon) {
super(context, icon);
}
@@ -34,6 +34,7 @@ public class CustomizeTileView extends QSTileView {
@Override
protected void createLabel() {
super.createLabel();
mLabelMinLines = mLabel.getMinLines();
View view = LayoutInflater.from(mContext).inflate(R.layout.qs_tile_label, null);
mAppLabel = (TextView) view.findViewById(R.id.tile_label);
mAppLabel.setAlpha(.6f);
@@ -44,6 +45,9 @@ public class CustomizeTileView extends QSTileView {
public void setShowAppLabel(boolean showAppLabel) {
mAppLabel.setVisibility(showAppLabel ? View.VISIBLE : View.GONE);
mLabel.setSingleLine(showAppLabel);
if (!showAppLabel) {
mLabel.setMinLines(mLabelMinLines);
}
}
public void setAppLabel(CharSequence label) {