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

Merge "Adapted the lockscreen style" into nyc-dev

Browse Source
This commit is contained in:
Selim Cinek
2016-02-24 03:59:44 +00:00
committed by Android (Google) Code Review
parent 1082306709 f1015dbe97
commit 6831e8ea76
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@@ -20,5 +20,5 @@
<resources> <resources>
<!-- Overload default clock widget parameters --> <!-- Overload default clock widget parameters -->
<dimen name="widget_big_font_size">100dp</dimen> <dimen name="widget_big_font_size">88dp</dimen>
</resources> </resources>

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

@@ -26,9 +26,9 @@
<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">125dp</dimen> <dimen name="widget_big_font_size">110dp</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">-1dp</dimen>
<!-- EmergencyCarrierArea overlap - amount to overlap the emergency button and carrier text. <!-- EmergencyCarrierArea overlap - amount to overlap the emergency button and carrier text.
Should be 0 on devices with plenty of room (e.g. tablets) --> Should be 0 on devices with plenty of room (e.g. tablets) -->

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">138dp</dimen> <dimen name="widget_big_font_size">122dp</dimen>
</resources> </resources>

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

@@ -39,9 +39,9 @@
<dimen name="eca_overlap">-10dip</dimen> <dimen name="eca_overlap">-10dip</dimen>
<!-- Default clock parameters --> <!-- Default clock parameters -->
<dimen name="bottom_text_spacing_digital">-10dp</dimen> <dimen name="bottom_text_spacing_digital">-1dp</dimen>
<dimen name="widget_label_font_size">14sp</dimen> <dimen name="widget_label_font_size">14sp</dimen>
<dimen name="widget_big_font_size">88dp</dimen> <dimen name="widget_big_font_size">78dp</dimen>
<!-- The y translation to apply at the start in appear animations. --> <!-- The y translation to apply at the start in appear animations. -->
<dimen name="appear_y_translation_start">32dp</dimen> <dimen name="appear_y_translation_start">32dp</dimen>

4
packages/SystemUI/res/values/dimens.xml
View File

@@ -351,8 +351,8 @@
<!-- The margin between the clock and the notifications on Keyguard. See <!-- The margin between the clock and the notifications on Keyguard. See
keyguard_clock_height_fraction_* for the difference between min and max.--> keyguard_clock_height_fraction_* for the difference between min and max.-->
<dimen name="keyguard_clock_notifications_margin_min">24dp</dimen> <dimen name="keyguard_clock_notifications_margin_min">30dp</dimen>
<dimen name="keyguard_clock_notifications_margin_max">36dp</dimen> <dimen name="keyguard_clock_notifications_margin_max">42dp</dimen>
<dimen name="heads_up_scrim_height">250dp</dimen> <dimen name="heads_up_scrim_height">250dp</dimen>
<!-- The minimum amount the user needs to swipe to go to the camera / phone. --> <!-- The minimum amount the user needs to swipe to go to the camera / phone. -->