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

Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jason Monk
2015-01-22 17:49:04 +00:00
committed by Android (Google) Code Review
parent 563e767a51 6ece24e106
commit 959ff1d3a9
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/qs/QSDualTileLabel.java
View File

@@ -100,9 +100,6 @@ public class QSDualTileLabel extends LinearLayout {
mFirstLineCaret.setImageDrawable(d); mFirstLineCaret.setImageDrawable(d);
if (d != null) { if (d != null) {
final int h = d.getIntrinsicHeight(); final int h = d.getIntrinsicHeight();
final LayoutParams lp = (LayoutParams) mSecondLine.getLayoutParams();
lp.topMargin = h * 4 / 5;
mSecondLine.setLayoutParams(lp);
mFirstLine.setMinHeight(h); mFirstLine.setMinHeight(h);
mFirstLine.setPadding(mHorizontalPaddingPx, 0, 0, 0); mFirstLine.setPadding(mHorizontalPaddingPx, 0, 0, 0);
} }