diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-04-30 13:31:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-30 13:31:27 +0000 |
| commit | 65e4a4ee301826c9d9f08180285a8ae514a84565 (patch) | |
| tree | 3b585a0328f47fdb92828fc377f24f9376d86c10 /packages/Keyguard | |
| parent | 29aa2f5645b25412ba1e648930f1caa906b9d69e (diff) | |
| parent | 984f6b7519e622b8ac656ec5b15bbde9c380ab82 (diff) | |
| download | frameworks_base-65e4a4ee301826c9d9f08180285a8ae514a84565.zip frameworks_base-65e4a4ee301826c9d9f08180285a8ae514a84565.tar.gz frameworks_base-65e4a4ee301826c9d9f08180285a8ae514a84565.tar.bz2 | |
am ed8b4ca0: Merge "Layout notifications on top and introduce artifical margin"
* commit 'ed8b4ca093d8aba40d29ef7ad701b28f8c313d97':
Layout notifications on top and introduce artifical margin
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/res/layout/keyguard_status_view.xml | 2 | ||||
| -rw-r--r-- | packages/Keyguard/res/values-sw600dp/dimens.xml | 2 | ||||
| -rw-r--r-- | packages/Keyguard/res/values-sw720dp/dimens.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_status_view.xml b/packages/Keyguard/res/layout/keyguard_status_view.xml index 3b3a069..546ddd4 100644 --- a/packages/Keyguard/res/layout/keyguard_status_view.xml +++ b/packages/Keyguard/res/layout/keyguard_status_view.xml @@ -24,7 +24,7 @@ android:id="@+id/keyguard_status_view" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" androidprv:layout_maxWidth="@dimen/keyguard_security_width" androidprv:layout_maxHeight="@dimen/keyguard_security_height" android:gravity="center_horizontal|top" diff --git a/packages/Keyguard/res/values-sw600dp/dimens.xml b/packages/Keyguard/res/values-sw600dp/dimens.xml index ea5ef27..25e86e1 100644 --- a/packages/Keyguard/res/values-sw600dp/dimens.xml +++ b/packages/Keyguard/res/values-sw600dp/dimens.xml @@ -32,7 +32,7 @@ <!-- Keyguard dimensions --> <!-- Size of the clock font in keyguard's status view --> - <dimen name="kg_status_clock_font_size">141dp</dimen> + <dimen name="kg_status_clock_font_size">120dp</dimen> <!-- Size of the generic status lines keyguard's status view --> <dimen name="kg_status_line_font_size">16sp</dimen> diff --git a/packages/Keyguard/res/values-sw720dp/dimens.xml b/packages/Keyguard/res/values-sw720dp/dimens.xml index 4853a7b..30b979c 100644 --- a/packages/Keyguard/res/values-sw720dp/dimens.xml +++ b/packages/Keyguard/res/values-sw720dp/dimens.xml @@ -19,7 +19,7 @@ <resources> <!-- Keyguard dimensions --> <!-- Size of the clock font in keyguard's status view --> - <dimen name="kg_status_clock_font_size">188dp</dimen> + <dimen name="kg_status_clock_font_size">140dp</dimen> <!-- Size of the generic status lines keyguard's status view --> <dimen name="kg_status_line_font_size">19sp</dimen> |