summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-10-10 17:43:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-10 17:43:17 -0700
commit4bd5f236c67460b2282648d1efd537ed3b50bf64 (patch)
treecc24b6eb2486c7a9d04b6ca0e3371662d28d35cc
parent23dd2d0c43ffbbb92c1f843860ea52c67fd56d6e (diff)
parent1111614b433f70673abc1eaac4a619d14d52e7e4 (diff)
downloadandroid_packages_apps_Trebuchet-4bd5f236c67460b2282648d1efd537ed3b50bf64.tar.gz
android_packages_apps_Trebuchet-4bd5f236c67460b2282648d1efd537ed3b50bf64.tar.bz2
android_packages_apps_Trebuchet-4bd5f236c67460b2282648d1efd537ed3b50bf64.zip
am 1111614b: am 3057b1c2: Fixing issue with folder opening in the wrong bounds (Bug. 11025207)
* commit '1111614b433f70673abc1eaac4a619d14d52e7e4': Fixing issue with folder opening in the wrong bounds (Bug. 11025207)
-rw-r--r--src/com/android/launcher3/Folder.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index a4cb11734..5231aacf5 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -888,7 +888,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
int centerY = (int) (mTempRect.top + mTempRect.height() * scale / 2);
int centeredLeft = centerX - width / 2;
int centeredTop = centerY - height / 2;
- int currentPage = mLauncher.getWorkspace().getCurrentPage();
+ int currentPage = mLauncher.getWorkspace().getNextPage();
// In case the workspace is scrolling, we need to use the final scroll to compute
// the folders bounds.
mLauncher.getWorkspace().setFinalScrollForPageChange(currentPage);