diff options
| author | Adam Powell <adamp@google.com> | 2010-05-03 15:23:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-03 15:23:32 -0700 |
| commit | 7b220c71e39a21ed89fe16d4b6c80557b12d7db2 (patch) | |
| tree | 009a69794c90842a8085e7ec24a25d27f0ac97e3 /src | |
| parent | 11c8f9cb93abdbfd01f6e8915900ab06627b2834 (diff) | |
| parent | fefa0ce22af9560f1c0f8c84c760c75f34b7b12c (diff) | |
| download | android_packages_apps_Trebuchet-7b220c71e39a21ed89fe16d4b6c80557b12d7db2.tar.gz android_packages_apps_Trebuchet-7b220c71e39a21ed89fe16d4b6c80557b12d7db2.tar.bz2 android_packages_apps_Trebuchet-7b220c71e39a21ed89fe16d4b6c80557b12d7db2.zip | |
am fefa0ce2: Fix bug 2646531 - regression in home screen bitmap caching
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/CellLayout.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index 351f01d5c..56b62ba91 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -579,7 +579,7 @@ public class CellLayout extends ViewGroup { final View view = getChildAt(i); view.setDrawingCacheEnabled(enabled); // Update the drawing caches - view.buildDrawingCache(false); + view.buildDrawingCache(true); } } diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index dca40cec4..f1e8d96e3 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -666,7 +666,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag // Scroll if the user moved far enough along the X axis mTouchState = TOUCH_STATE_SCROLLING; mLastMotionX = x; - enableChildrenCache(0, getChildCount()); + enableChildrenCache(mCurrentScreen - 1, mCurrentScreen + 1); } // Either way, cancel any pending longpress if (mAllowLongPress) { @@ -868,6 +868,9 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag // Remember where the motion event started mLastMotionX = ev.getX(); mActivePointerId = ev.getPointerId(0); + if (mTouchState == TOUCH_STATE_SCROLLING) { + enableChildrenCache(mCurrentScreen - 1, mCurrentScreen + 1); + } break; case MotionEvent.ACTION_MOVE: if (mTouchState == TOUCH_STATE_SCROLLING) { |