diff options
author | Winson Chung <winsonc@google.com> | 2011-07-11 15:20:48 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2011-07-12 16:04:46 -0700 |
commit | a62e9fd95ae10cff4676f2cc1f4d68334ca27a0b (patch) | |
tree | db42f288a740bbaaf689f070e0aff66367be10de /src/com/android/launcher2/ButtonDropTarget.java | |
parent | fe63476a2d0b12dfc692c425d1c6cdbb41774ef0 (diff) | |
download | android_packages_apps_Trebuchet-a62e9fd95ae10cff4676f2cc1f4d68334ca27a0b.tar.gz android_packages_apps_Trebuchet-a62e9fd95ae10cff4676f2cc1f4d68334ca27a0b.tar.bz2 android_packages_apps_Trebuchet-a62e9fd95ae10cff4676f2cc1f4d68334ca27a0b.zip |
Cleaning up some drop-target issues.
- Setting text color during drag over transitions
- Fixing regression in drop target padding
= Using old drop-down animation where possible
Change-Id: Ia1c5ec9e58fc734d28133349d9920d123ed71ae6
Diffstat (limited to 'src/com/android/launcher2/ButtonDropTarget.java')
-rw-r--r-- | src/com/android/launcher2/ButtonDropTarget.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/com/android/launcher2/ButtonDropTarget.java b/src/com/android/launcher2/ButtonDropTarget.java index f87889cfb..edc5acf21 100644 --- a/src/com/android/launcher2/ButtonDropTarget.java +++ b/src/com/android/launcher2/ButtonDropTarget.java @@ -17,6 +17,7 @@ package com.android.launcher2; import android.content.Context; +import android.content.res.Resources; import android.graphics.Paint; import android.util.AttributeSet; import android.widget.FrameLayout; @@ -32,6 +33,7 @@ public class ButtonDropTarget extends FrameLayout implements DropTarget, DragCon protected final int mTransitionDuration; protected Launcher mLauncher; + private int mBottomDragPadding; /** Whether this drop target is active for the current drag */ protected boolean mActive; @@ -46,8 +48,9 @@ public class ButtonDropTarget extends FrameLayout implements DropTarget, DragCon public ButtonDropTarget(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - mTransitionDuration = - context.getResources().getInteger(R.integer.config_dropTargetBgTransitionDuration); + Resources r = getResources(); + mTransitionDuration = r.getInteger(R.integer.config_dropTargetBgTransitionDuration); + mBottomDragPadding = r.getDimensionPixelSize(R.dimen.drop_target_drag_padding); } void setLauncher(Launcher launcher) { @@ -87,6 +90,12 @@ public class ButtonDropTarget extends FrameLayout implements DropTarget, DragCon } @Override + public void getHitRect(android.graphics.Rect outRect) { + super.getHitRect(outRect); + outRect.bottom += mBottomDragPadding; + } + + @Override public DropTarget getDropTargetDelegate(DragObject d) { return null; } |