diff options
author | Michael Jurka <mikejurka@google.com> | 2012-05-15 17:01:25 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-15 17:01:25 -0700 |
commit | 8bc26993d5a6fd3980a1da3d65aca666ba385cda (patch) | |
tree | 01b77149d3c65478615086972fb86d83882a0281 /src/com/android/launcher2 | |
parent | fdbff22e6e4c88a42b4dd6d63c21023aba1e62bb (diff) | |
parent | 5e368ffbad2fb08e3eadab98eeefd4e1d05bdb2b (diff) | |
download | android_packages_apps_Trebuchet-8bc26993d5a6fd3980a1da3d65aca666ba385cda.tar.gz android_packages_apps_Trebuchet-8bc26993d5a6fd3980a1da3d65aca666ba385cda.tar.bz2 android_packages_apps_Trebuchet-8bc26993d5a6fd3980a1da3d65aca666ba385cda.zip |
Merge "Solve stutter when swiping All Apps the first time" into jb-dev
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher2/PagedView.java | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 358054535..a3d8f8d40 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -816,6 +816,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen onSyncWidgetPageItems(d); } mDeferredSyncWidgetPageItems.clear(); + mForceDrawAllChildrenNextFrame = !toWorkspace; } @Override @@ -1519,7 +1520,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen @Override protected void onPageEndMoving() { super.onPageEndMoving(); - + mForceDrawAllChildrenNextFrame = true; // We reset the save index when we change pages so that it will be recalculated on next // rotation mSaveInstanceStateItemIndex = -1; diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index 02f1c22b8..93725ce54 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -134,6 +134,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc protected boolean mAllowOverScroll = true; protected int mUnboundedScrollX; protected int[] mTempVisiblePagesRange = new int[2]; + protected boolean mForceDrawAllChildrenNextFrame; // mOverScrollX is equal to getScrollX() when we're within the normal scroll range. Otherwise // it is equal to the scaled overscroll position. We use a separate value so as to prevent @@ -797,13 +798,15 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc // View.INVISIBLE, preventing re-drawing of their hardware layer for (int i = getChildCount() - 1; i >= 0; i--) { final View v = getPageAt(i); - if (leftScreen <= i && i <= rightScreen && shouldDrawChild(v)) { + if (mForceDrawAllChildrenNextFrame || + (leftScreen <= i && i <= rightScreen && shouldDrawChild(v))) { v.setVisibility(VISIBLE); drawChild(canvas, v, drawingTime); } else { v.setVisibility(INVISIBLE); } } + mForceDrawAllChildrenNextFrame = false; canvas.restore(); } } |