summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-03-28 13:18:42 -0700
committerAdam Cohen <adamcohen@google.com>2011-03-28 14:16:36 -0700
commit8878a32f26b7e6c287d970950526cd0e6eabb21d (patch)
tree1a85a19b15157dea17e6be848a5804a955c2987f /src/com/android
parent99e8b40b374d49baabf0c4f4e4278ac25828899b (diff)
downloadandroid_packages_apps_Trebuchet-8878a32f26b7e6c287d970950526cd0e6eabb21d.tar.gz
android_packages_apps_Trebuchet-8878a32f26b7e6c287d970950526cd0e6eabb21d.tar.bz2
android_packages_apps_Trebuchet-8878a32f26b7e6c287d970950526cd0e6eabb21d.zip
Fixing drag icon location on non-xlarge devices
Change-Id: I7897f67e145818866a51c6a50d4d3e59674b08b4
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/launcher2/DragView.java4
-rw-r--r--src/com/android/launcher2/Workspace.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher2/DragView.java b/src/com/android/launcher2/DragView.java
index 45620b90b..ab997446d 100644
--- a/src/com/android/launcher2/DragView.java
+++ b/src/com/android/launcher2/DragView.java
@@ -87,8 +87,8 @@ public class DragView extends View {
scale.setScale(scaleFactor, scaleFactor);
}
- final int offsetX = res.getInteger(R.integer.config_dragViewOffsetX);
- final int offsetY = res.getInteger(R.integer.config_dragViewOffsetY);
+ final int offsetX = res.getDimensionPixelSize(R.dimen.dragViewOffsetX);
+ final int offsetY = res.getDimensionPixelSize(R.dimen.dragViewOffsetY);
// Animate the view into the correct position
mAnim = ValueAnimator.ofFloat(0.0f, 1.0f);
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 92be5dc77..15c164ad7 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2175,8 +2175,8 @@ public class Workspace extends SmoothPagedView
// Based on the position of the drag view, find the top left of the original view
int viewX = dragViewX + (dragView.getWidth() - child.getWidth()) / 2;
int viewY = dragViewY + (dragView.getHeight() - child.getHeight()) / 2;
- viewX += getResources().getInteger(R.integer.config_dragViewOffsetX);
- viewY += getResources().getInteger(R.integer.config_dragViewOffsetY);
+ viewX += getResources().getDimensionPixelSize(R.dimen.dragViewOffsetX);
+ viewY += getResources().getDimensionPixelSize(R.dimen.dragViewOffsetY);
// Set its old pos (in the new parent's coordinates); it will be animated
// in animateViewIntoPosition after the next layout pass