diff options
| author | Jason Monk <jmonk@google.com> | 2015-01-22 18:10:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-22 18:10:21 +0000 |
| commit | f55291a101b571757e7a15beecbb23ce336fc235 (patch) | |
| tree | 897a51555e7abdc914d45e77bceb5c137b147ec7 /packages/SystemUI/src/com/android/systemui/qs | |
| parent | 0829cf2b9a9c18d495816077d33a293b1ca25720 (diff) | |
| parent | e1e44ed73a340964113f8c8c0702f469aa3f0940 (diff) | |
| download | frameworks_base-f55291a101b571757e7a15beecbb23ce336fc235.zip frameworks_base-f55291a101b571757e7a15beecbb23ce336fc235.tar.gz frameworks_base-f55291a101b571757e7a15beecbb23ce336fc235.tar.bz2 | |
Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev automerge: 959ff1d automerge: 485ee97
automerge: e1e44ed
* commit 'e1e44ed73a340964113f8c8c0702f469aa3f0940':
QS: Fix second line in dual tiles
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/qs')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSDualTileLabel.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDualTileLabel.java b/packages/SystemUI/src/com/android/systemui/qs/QSDualTileLabel.java index a9fdc86..67cfc59 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSDualTileLabel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSDualTileLabel.java @@ -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); } |