diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-05-14 23:15:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 23:15:24 +0000 |
| commit | fcb34c599f59d3bd73edad1848c081548e721024 (patch) | |
| tree | e38fca18a37a672c2ca24db6733568233af151f1 | |
| parent | 979936920ee2e654e23678172c49b301e886c374 (diff) | |
| parent | e5716222a1a11922267193d5815fb083fc4e11d3 (diff) | |
| download | frameworks_base-fcb34c599f59d3bd73edad1848c081548e721024.zip frameworks_base-fcb34c599f59d3bd73edad1848c081548e721024.tar.gz frameworks_base-fcb34c599f59d3bd73edad1848c081548e721024.tar.bz2 | |
Merge "Adjust lockscreen style to spec" into mnc-dev
9 files changed, 12 insertions, 7 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_status_area.xml b/packages/Keyguard/res/layout/keyguard_status_area.xml index 7d8977c..8fe2835 100644 --- a/packages/Keyguard/res/layout/keyguard_status_area.xml +++ b/packages/Keyguard/res/layout/keyguard_status_area.xml @@ -30,6 +30,8 @@ android:layout_height="wrap_content" android:textColor="@color/clock_white" style="@style/widget_label" + android:textAllCaps="true" + android:letterSpacing="0.15" android:gravity="center" /> <TextView android:id="@+id/alarm_status" @@ -38,6 +40,8 @@ android:drawablePadding="6dp" android:drawableStart="@drawable/ic_access_alarms_big" android:textColor="@color/clock_gray" + android:letterSpacing="0.15" + android:textAllCaps="true" style="@style/widget_label" android:layout_marginStart="6dp" android:gravity="center" diff --git a/packages/Keyguard/res/layout/keyguard_status_view.xml b/packages/Keyguard/res/layout/keyguard_status_view.xml index 69f510e..fc0b568 100644 --- a/packages/Keyguard/res/layout/keyguard_status_view.xml +++ b/packages/Keyguard/res/layout/keyguard_status_view.xml @@ -57,6 +57,7 @@ android:layout_gravity="center_horizontal" android:textColor="@color/clock_gray" android:textSize="@dimen/widget_label_font_size" + android:letterSpacing="0.05" android:ellipsize="marquee" android:singleLine="true" /> diff --git a/packages/Keyguard/res/values-h650dp/dimens.xml b/packages/Keyguard/res/values-h650dp/dimens.xml index 4864326..92035bb 100644 --- a/packages/Keyguard/res/values-h650dp/dimens.xml +++ b/packages/Keyguard/res/values-h650dp/dimens.xml @@ -16,5 +16,5 @@ --> <resources> - <dimen name="widget_big_font_size">112dp</dimen> + <dimen name="widget_big_font_size">104dp</dimen> </resources>
\ No newline at end of file diff --git a/packages/Keyguard/res/values-sw600dp/dimens.xml b/packages/Keyguard/res/values-sw600dp/dimens.xml index 5de1d11..b181682 100644 --- a/packages/Keyguard/res/values-sw600dp/dimens.xml +++ b/packages/Keyguard/res/values-sw600dp/dimens.xml @@ -26,7 +26,7 @@ <dimen name="keyguard_security_view_margin">12dp</dimen> <!-- Overload default clock widget parameters --> - <dimen name="widget_big_font_size">140dp</dimen> + <dimen name="widget_big_font_size">125dp</dimen> <dimen name="widget_label_font_size">16sp</dimen> <dimen name="bottom_text_spacing_digital">-16dp</dimen> diff --git a/packages/Keyguard/res/values-sw720dp/dimens.xml b/packages/Keyguard/res/values-sw720dp/dimens.xml index 428c18e..08ab791 100644 --- a/packages/Keyguard/res/values-sw720dp/dimens.xml +++ b/packages/Keyguard/res/values-sw720dp/dimens.xml @@ -24,5 +24,5 @@ <!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) --> <dimen name="keyguard_security_height">420dp</dimen> - <dimen name="widget_big_font_size">150dp</dimen> + <dimen name="widget_big_font_size">138dp</dimen> </resources> diff --git a/packages/Keyguard/res/values/colors.xml b/packages/Keyguard/res/values/colors.xml index 3b741ea..3998c5b 100644 --- a/packages/Keyguard/res/values/colors.xml +++ b/packages/Keyguard/res/values/colors.xml @@ -17,5 +17,5 @@ <!-- Clock --> <color name="clock_white">#ffffffff</color> - <color name="clock_gray">#99ffffff</color> + <color name="clock_gray">@*android:color/secondary_text_default_material_dark</color> </resources> diff --git a/packages/Keyguard/res/values/dimens.xml b/packages/Keyguard/res/values/dimens.xml index 9290236..18d893a 100644 --- a/packages/Keyguard/res/values/dimens.xml +++ b/packages/Keyguard/res/values/dimens.xml @@ -40,7 +40,7 @@ <!-- Default clock parameters --> <dimen name="bottom_text_spacing_digital">-10dp</dimen> - <dimen name="widget_label_font_size">16sp</dimen> + <dimen name="widget_label_font_size">14sp</dimen> <dimen name="widget_big_font_size">88dp</dimen> <!-- The y translation to apply at the start in appear animations. --> diff --git a/packages/Keyguard/res/values/styles.xml b/packages/Keyguard/res/values/styles.xml index 404a17e..943c3ea 100644 --- a/packages/Keyguard/res/values/styles.xml +++ b/packages/Keyguard/res/values/styles.xml @@ -41,7 +41,7 @@ </style> <style name="widget_big_thin"> <item name="android:textSize">@dimen/widget_big_font_size</item> - <item name="android:fontFamily">sans-serif-thin</item> + <item name="android:fontFamily">sans-serif-light</item> </style> <style name="BouncerSecurityContainer"> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index 808f1ff..450fdd9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -45,7 +45,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, public static final long ANIMATION_DURATION = 220; private static final float SCRIM_BEHIND_ALPHA = 0.62f; - private static final float SCRIM_BEHIND_ALPHA_KEYGUARD = 0.55f; + private static final float SCRIM_BEHIND_ALPHA_KEYGUARD = 0.45f; private static final float SCRIM_BEHIND_ALPHA_UNLOCKING = 0.2f; private static final float SCRIM_IN_FRONT_ALPHA = 0.75f; private static final int TAG_KEY_ANIM = R.id.scrim; |