Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 485ee978 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

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

automerge: 959ff1d3

* commit '959ff1d3':
  QS: Fix second line in dual tiles
parents 2700393c 959ff1d3

packages/SystemUI/src/com/android/systemui/qs/QSDualTileLabel.java

+0 −3
Original line number Diff line number Diff line
@@ -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);

        }