diff options
| author | Michael Wright <michaelwr@google.com> | 2013-09-30 18:38:36 -0700 |
|---|---|---|
| committer | Michael Wright <michaelwr@google.com> | 2013-09-30 18:38:36 -0700 |
| commit | f40ec0f00f5f9426c859ff70337601c1747ac586 (patch) | |
| tree | 0e452416510deecf8e04b77f887624c3ee01e925 | |
| parent | 8b3bc51c8f03b2877e834fb1a739eb729a7ad8a1 (diff) | |
| download | frameworks_base-f40ec0f00f5f9426c859ff70337601c1747ac586.zip frameworks_base-f40ec0f00f5f9426c859ff70337601c1747ac586.tar.gz frameworks_base-f40ec0f00f5f9426c859ff70337601c1747ac586.tar.bz2 | |
Move slide to unlock circle up
Because HH is such a tall device, we need to move the circle up in
order to put it in the correct physical location.
Bug: 10900855
Change-Id: Idf90839e19f89784a96d110dd897bdacb58cb616
| -rw-r--r-- | packages/Keyguard/res/layout/keyguard_glow_pad_container.xml | 4 | ||||
| -rw-r--r-- | packages/Keyguard/res/values-sw360dp/dimens.xml | 6 | ||||
| -rw-r--r-- | packages/Keyguard/res/values/dimens.xml | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_glow_pad_container.xml b/packages/Keyguard/res/layout/keyguard_glow_pad_container.xml index 376d0e9..07953b4 100644 --- a/packages/Keyguard/res/layout/keyguard_glow_pad_container.xml +++ b/packages/Keyguard/res/layout/keyguard_glow_pad_container.xml @@ -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>
\ No newline at end of file + android:layout_marginBottom="@dimen/glowpadcontainer_bottom_margin"/> +</merge> diff --git a/packages/Keyguard/res/values-sw360dp/dimens.xml b/packages/Keyguard/res/values-sw360dp/dimens.xml index 41d6ac0..6e39a42 100644 --- a/packages/Keyguard/res/values-sw360dp/dimens.xml +++ b/packages/Keyguard/res/values-sw360dp/dimens.xml @@ -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> diff --git a/packages/Keyguard/res/values/dimens.xml b/packages/Keyguard/res/values/dimens.xml index fde63c4..ce72f43 100644 --- a/packages/Keyguard/res/values/dimens.xml +++ b/packages/Keyguard/res/values/dimens.xml @@ -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> |