diff options
| author | 2018-01-29 17:15:09 +0000 | |
|---|---|---|
| committer | 2018-01-29 17:15:09 +0000 | |
| commit | 1f73477d78cda5e905e74a35c43fb80345fa1d1d (patch) | |
| tree | b2e5563358d2d9d9d87e24fa6e88a06045af20c2 | |
| parent | 6fa646ab95de0967a79bb9a136e75623de2cc808 (diff) | |
| parent | 37d411872e5646e6cc03154d5ec89d4ae0e3f61f (diff) | |
Merge "Lock screen message alignment"
| -rw-r--r-- | packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res-keyguard/values/dimens.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml index eda8c69e65f2..faa2c17b63bf 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml @@ -31,6 +31,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/widget_vertical_padding" android:orientation="vertical"> <RelativeLayout android:id="@+id/keyguard_clock_container" @@ -63,7 +64,6 @@ <include layout="@layout/keyguard_status_area" android:id="@+id/keyguard_status_area" android:layout_marginTop="20dp" - android:layout_marginBottom="@dimen/widget_vertical_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/clock_separator" /> diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml index 5aca7f9332e6..28a0935bf2f5 100644 --- a/packages/SystemUI/res-keyguard/values/dimens.xml +++ b/packages/SystemUI/res-keyguard/values/dimens.xml @@ -75,7 +75,7 @@ <dimen name="password_char_padding">8dp</dimen> <!-- The vertical margin between the date and the owner info. --> - <dimen name="date_owner_info_margin">6dp</dimen> + <dimen name="date_owner_info_margin">2dp</dimen> <!-- The translation for disappearing security views after having solved them. --> <dimen name="disappear_y_translation">-32dp</dimen> |