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

automerge: 959ff1d

* commit '959ff1d3a991b20140843187b2fb08c5a96c202b':
  QS: Fix second line in dual tiles
This commit is contained in:
Jason Monk
2015-01-22 17:59:13 +00:00
committed by android-build-merger

View File

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