summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-09-27 12:17:31 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-27 12:17:31 -0700
commitac90bf1883e608ec3256b1263ec9d2cdc9216a04 (patch)
treebf9e0e76a988807f30e768aead7ea2820d95a703 /src
parentcd61d139479709f0e2fa7a8c37109906d871d876 (diff)
parent2792a33ecc9b2def0cdd31756c45f5fe73cf13ac (diff)
downloadandroid_packages_apps_Trebuchet-ac90bf1883e608ec3256b1263ec9d2cdc9216a04.tar.gz
android_packages_apps_Trebuchet-ac90bf1883e608ec3256b1263ec9d2cdc9216a04.tar.bz2
android_packages_apps_Trebuchet-ac90bf1883e608ec3256b1263ec9d2cdc9216a04.zip
Merge "Addressing slow rotation due to folders (issue 5297213)"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Folder.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index f44d3ed60..71b708128 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -817,12 +817,14 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
lp.cellX = vacant[0];
lp.cellY = vacant[1];
ItemInfo info = (ItemInfo) v.getTag();
- info.cellX = vacant[0];
- info.cellY = vacant[1];
+ if (info.cellX != vacant[0] || info.cellY != vacant[1]) {
+ info.cellX = vacant[0];
+ info.cellY = vacant[1];
+ LauncherModel.addOrMoveItemInDatabase(mLauncher, info, mInfo.id, 0,
+ info.cellX, info.cellY);
+ }
boolean insert = false;
mContent.addViewToCellLayout(v, insert ? 0 : -1, (int)info.id, lp, true);
- LauncherModel.addOrMoveItemInDatabase(mLauncher, info, mInfo.id, 0,
- info.cellX, info.cellY);
}
mItemsInvalidated = true;
}