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

Merge "Move slide to unlock circle up" into klp-dev

Browse Source
This commit is contained in:
Michael Wright
2013-10-01 01:46:53 +00:00
committed by Android (Google) Code Review
parent 95b1bbfe6c f40ec0f00f
commit 02cefe27f3
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,5 +22,5 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="-80dp"/> android:layout_marginBottom="@dimen/glowpadcontainer_bottom_margin"/>
</merge> </merge>

6
packages/Keyguard/res/values-sw360dp/dimens.xml
View File

@@ -19,7 +19,11 @@
--> -->
<resources> <resources>
<!-- 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">400dp</dimen> <dimen name="keyguard_security_height">400dp</dimen>
<!-- The bottom margin for the GlowPadView container -->
<dimen name="glowpadcontainer_bottom_margin">-48dp</dimen>
</resources> </resources>

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

@@ -32,6 +32,9 @@
<!-- Size of lockscreen outerring on unsecure unlock LockScreen --> <!-- Size of lockscreen outerring on unsecure unlock LockScreen -->
<dimen name="keyguard_lockscreen_outerring_diameter">270dp</dimen> <dimen name="keyguard_lockscreen_outerring_diameter">270dp</dimen>
<!-- The bottom margin for the GlowPadView container -->
<dimen name="glowpadcontainer_bottom_margin">-80dp</dimen>
<!-- Default target placement radius for GlowPadView. Should be 1/2 of outerring diameter. --> <!-- Default target placement radius for GlowPadView. Should be 1/2 of outerring diameter. -->
<dimen name="glowpadview_target_placement_radius">135dip</dimen> <dimen name="glowpadview_target_placement_radius">135dip</dimen>