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

am 02cefe27: Merge "Move slide to unlock circle up" into klp-dev

Browse Source 
* commit '02cefe27f334c0919983ec62ab7b679696d3b6b8':
  Move slide to unlock circle up
This commit is contained in:
Michael Wright
2013-10-02 09:34:13 -07:00
committed by Android Git Automerger
parent 8fd521c744 02cefe27f3
commit cd479b6e88
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_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="-80dp"/>
</merge>
android:layout_marginBottom="@dimen/glowpadcontainer_bottom_margin"/>
</merge>

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

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

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

@@ -32,6 +32,9 @@
<!-- Size of lockscreen outerring on unsecure unlock LockScreen -->
<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. -->
<dimen name="glowpadview_target_placement_radius">135dip</dimen>