summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorPatrick Dubroy <dubroy@google.com>2010-11-09 15:23:28 -0800
committerPatrick Dubroy <dubroy@google.com>2010-11-09 15:23:44 -0800
commit72e0d34fc5d86260a7bd173aed44acf8b66b1c1d (patch)
tree4036fa30bd827b493558bc9bb4c072bdd0cfa214 /src/com
parent448b0b5e8665ec540ccefbb962f7ccb22e3bbb62 (diff)
downloadandroid_packages_apps_Trebuchet-72e0d34fc5d86260a7bd173aed44acf8b66b1c1d.tar.gz
android_packages_apps_Trebuchet-72e0d34fc5d86260a7bd173aed44acf8b66b1c1d.tar.bz2
android_packages_apps_Trebuchet-72e0d34fc5d86260a7bd173aed44acf8b66b1c1d.zip
Fix 3165989: Items dragged from All Apps don't appear
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher2/PagedView.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index e9829fbfa..0622aaea0 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -248,8 +248,12 @@ public abstract class PagedView extends ViewGroup {
* Sets the current page.
*/
void setCurrentPage(int currentPage) {
- if (!mScroller.isFinished()) mScroller.abortAnimation();
- if (getChildCount() == 0) return;
+ if (!mScroller.isFinished()) {
+ mScroller.abortAnimation();
+ }
+ if (getChildCount() == 0 || currentPage == mCurrentPage) {
+ return;
+ }
mCurrentPage = Math.max(0, Math.min(currentPage, getPageCount() - 1));
int newX = getChildOffset(mCurrentPage) - getRelativeChildOffset(mCurrentPage);