diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-06-14 09:49:19 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-06-14 09:49:19 +0400 |
| commit | 4ccca1f800ca8f38051d5e8144d80a9f6bfc5cdc (patch) | |
| tree | 76e336388a60994c275d875bf5ebdbccd865fadb /core | |
| parent | 34bd98dfb12a180fe7a5a0b63573eb520fbdbe9a (diff) | |
| parent | ce152c647662e30edd94b492e726bbf30cc6ac6d (diff) | |
| download | frameworks_base-4ccca1f800ca8f38051d5e8144d80a9f6bfc5cdc.zip frameworks_base-4ccca1f800ca8f38051d5e8144d80a9f6bfc5cdc.tar.gz frameworks_base-4ccca1f800ca8f38051d5e8144d80a9f6bfc5cdc.tar.bz2 | |
Merge "LockscreenTarget : Switch to dp from px for insets" into ics
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java | 12 | ||||
| -rw-r--r-- | core/res/res/values/dimens.xml | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java b/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java index 465bd24..12000b0 100644 --- a/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java +++ b/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java @@ -109,18 +109,6 @@ public class MultiWaveView extends View { public final static int MAX_PHONE_TARGETS = 4; /** - * Inset padding for lockscreen targets for tablets - * @hide - */ - public final static int TABLET_TARGET_INSET = 30; - - /** - * Inset padding for lockscreen targets for phones - * @hide - */ - public final static int PHONE_TARGET_INSET = 60; - - /** * Empty target used to reference unused lockscreen targets * @hide */ diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 82ef68a..b7c794b 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -201,4 +201,8 @@ <!-- Minimum width for an action button in the menu area of an action bar --> <dimen name="action_button_min_width">56dip</dimen> + + <!-- Lockscreen target insets --> + <item type="dimen" name="lockscreen_target_inset">25dp</item> + </resources> |