summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/qs
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-01-22 17:49:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-22 17:49:06 +0000
commit959ff1d3a991b20140843187b2fb08c5a96c202b (patch)
tree30e10508b51c0b3b2ea9032a874ff94ba5d73ace /packages/SystemUI/src/com/android/systemui/qs
parent563e767a51357ed55c3fc53047fb9f94e4ef3c31 (diff)
parent6ece24e10621e46d3ea49d3361ec10f6792ffb86 (diff)
downloadframeworks_base-959ff1d3a991b20140843187b2fb08c5a96c202b.zip
frameworks_base-959ff1d3a991b20140843187b2fb08c5a96c202b.tar.gz
frameworks_base-959ff1d3a991b20140843187b2fb08c5a96c202b.tar.bz2
Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/qs')
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/QSDualTileLabel.java3
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);
}