Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9c1c33b9: am fcb34c59: Merge "Adjust lockscreen style to spec" into mnc-dev

Browse Source 
* commit '9c1c33b9dc9afdbf207ca95fb0d8aab5143eee6f':
  Adjust lockscreen style to spec
This commit is contained in:
Jorim Jaggi
2015-05-14 23:49:02 +00:00
committed by Android Git Automerger
parent 00c8ff6d5e 9c1c33b9dc
commit 95ffecaa0b
9 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Keyguard/res/layout/keyguard_status_area.xml
View File

@@ -30,6 +30,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/clock_white" android:textColor="@color/clock_white"
style="@style/widget_label" style="@style/widget_label"
android:textAllCaps="true"
android:letterSpacing="0.15"
android:gravity="center" android:gravity="center"
/> />
<TextView android:id="@+id/alarm_status" <TextView android:id="@+id/alarm_status"
@@ -38,6 +40,8 @@
android:drawablePadding="6dp" android:drawablePadding="6dp"
android:drawableStart="@drawable/ic_access_alarms_big" android:drawableStart="@drawable/ic_access_alarms_big"
android:textColor="@color/clock_gray" android:textColor="@color/clock_gray"
android:letterSpacing="0.15"
android:textAllCaps="true"
style="@style/widget_label" style="@style/widget_label"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:gravity="center" android:gravity="center"

1
packages/Keyguard/res/layout/keyguard_status_view.xml
View File

@@ -57,6 +57,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:textColor="@color/clock_gray" android:textColor="@color/clock_gray"
android:textSize="@dimen/widget_label_font_size" android:textSize="@dimen/widget_label_font_size"
android:letterSpacing="0.05"
android:ellipsize="marquee" android:ellipsize="marquee"
android:singleLine="true" /> android:singleLine="true" />

2
packages/Keyguard/res/values-h650dp/dimens.xml
View File

@@ -16,5 +16,5 @@
--> -->
<resources> <resources>
<dimen name="widget_big_font_size">112dp</dimen> <dimen name="widget_big_font_size">104dp</dimen>
</resources> </resources>

2
packages/Keyguard/res/values-sw600dp/dimens.xml
View File

@@ -26,7 +26,7 @@
<dimen name="keyguard_security_view_margin">12dp</dimen> <dimen name="keyguard_security_view_margin">12dp</dimen>
<!-- Overload default clock widget parameters --> <!-- 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="widget_label_font_size">16sp</dimen>
<dimen name="bottom_text_spacing_digital">-16dp</dimen> <dimen name="bottom_text_spacing_digital">-16dp</dimen>

2
packages/Keyguard/res/values-sw720dp/dimens.xml
View File

@@ -24,5 +24,5 @@
<!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) --> <!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
<dimen name="keyguard_security_height">420dp</dimen> <dimen name="keyguard_security_height">420dp</dimen>
<dimen name="widget_big_font_size">150dp</dimen> <dimen name="widget_big_font_size">138dp</dimen>
</resources> </resources>

2
packages/Keyguard/res/values/colors.xml
View File

@@ -17,5 +17,5 @@
<!-- Clock --> <!-- Clock -->
<color name="clock_white">#ffffffff</color> <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> </resources>

2
packages/Keyguard/res/values/dimens.xml
View File

@@ -40,7 +40,7 @@
<!-- Default clock parameters --> <!-- Default clock parameters -->
<dimen name="bottom_text_spacing_digital">-10dp</dimen> <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> <dimen name="widget_big_font_size">88dp</dimen>
<!-- The y translation to apply at the start in appear animations. --> <!-- The y translation to apply at the start in appear animations. -->

2
packages/Keyguard/res/values/styles.xml
View File

@@ -41,7 +41,7 @@
</style> </style>
<style name="widget_big_thin"> <style name="widget_big_thin">
<item name="android:textSize">@dimen/widget_big_font_size</item> <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>
<style name="BouncerSecurityContainer"> <style name="BouncerSecurityContainer">

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
View File

@@ -45,7 +45,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
public static final long ANIMATION_DURATION = 220; public static final long ANIMATION_DURATION = 220;
private static final float SCRIM_BEHIND_ALPHA = 0.62f; 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_BEHIND_ALPHA_UNLOCKING = 0.2f;
private static final float SCRIM_IN_FRONT_ALPHA = 0.75f; private static final float SCRIM_IN_FRONT_ALPHA = 0.75f;
private static final int TAG_KEY_ANIM = R.id.scrim; private static final int TAG_KEY_ANIM = R.id.scrim;