summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-08-12 11:32:29 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-12 11:32:29 -0700
commita8d6fb194c1577b702f2e531fed699189f3d3a9f (patch)
tree126562fe5c6f00bf6ca5c1eff506e4e53f537d76 /src
parentb8d0e1c3b329a3be07adb261b7b4031e87b6d70c (diff)
parente50adee3d54978840036bb3a814771ce498aee18 (diff)
downloadandroid_packages_apps_Trebuchet-a8d6fb194c1577b702f2e531fed699189f3d3a9f.tar.gz
android_packages_apps_Trebuchet-a8d6fb194c1577b702f2e531fed699189f3d3a9f.tar.bz2
android_packages_apps_Trebuchet-a8d6fb194c1577b702f2e531fed699189f3d3a9f.zip
Merge "Fixing issue where open folder placeholders were not being set to the correct cell position. (5109754)"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 0f074ac06..f9d31757f 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1666,7 +1666,8 @@ public final class Launcher extends Activity
FolderInfo info = (FolderInfo) fi.getTag();
if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
CellLayout cl = (CellLayout) fi.getParent().getParent();
- cl.setFolderLeaveBehindCell(info.cellX, info.cellY);
+ CellLayout.LayoutParams lp = (CellLayout.LayoutParams) fi.getLayoutParams();
+ cl.setFolderLeaveBehindCell(lp.cellX, lp.cellY);
}
ObjectAnimator oa = ObjectAnimator.ofPropertyValuesHolder(fi, alpha, scaleX, scaleY);