summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Philip Milne <pmilne@google.com> 2012-10-05 10:42:46 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-10-05 10:42:46 -0700
commit04b0963669ed6e55b8a779288ba8d4f8b92bc98f (patch)
tree6101ebaef65439e6fdca3dd9f27b76731ccfa45b
parentfcfd3e68ab5979b096de9df7fee20db53d8d806c (diff)
parent0223ffaa040ea071916d26e06e9913a08ccf1e55 (diff)
Merge "Fix for bug: 7281620. Blank line after date in status widget disappears." into jb-mr1-dev
-rw-r--r--core/res/res/layout/keyguard_status_view.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/res/res/layout/keyguard_status_view.xml b/core/res/res/layout/keyguard_status_view.xml
index c7f6863317f1..951787b0b977 100644
--- a/core/res/res/layout/keyguard_status_view.xml
+++ b/core/res/res/layout/keyguard_status_view.xml
@@ -59,6 +59,7 @@
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="-16dp"
+ android:layout_marginBottom="24dp"
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
android:singleLine="true"
android:ellipsize="marquee"
@@ -69,7 +70,7 @@
<TextView
android:id="@+id/alarm_status"
android:layout_gravity="end"
- android:layout_marginTop="28dp"
+ android:layout_marginTop="4dp"
android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"
android:singleLine="true"
android:ellipsize="marquee"