diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-08-24 20:06:18 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2011-08-24 20:09:14 -0700 |
| commit | de258f1eb0355cadb75ee0566f3624bff4930290 (patch) | |
| tree | a4f29547d4e13e0746d86430d15717fcb54809d5 /src/com/android | |
| parent | 9dc6596877e040e19274d28928452f8e1589f884 (diff) | |
| download | android_packages_apps_Trebuchet-de258f1eb0355cadb75ee0566f3624bff4930290.tar.gz android_packages_apps_Trebuchet-de258f1eb0355cadb75ee0566f3624bff4930290.tar.bz2 android_packages_apps_Trebuchet-de258f1eb0355cadb75ee0566f3624bff4930290.zip | |
No longer using hardware layers for folders, issue 5051178
Change-Id: I875b91c6d7cce028f33dceb5ac17bc43ce045039
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher2/Folder.java | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index 1fcfebc5a..a0342cf06 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -97,7 +97,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList private int mFolderNameHeight; private Rect mHitRect = new Rect(); private Rect mTempRect = new Rect(); - private boolean mFirstOpen = true; private boolean mDragInProgress = false; private boolean mDeleteFolderOnDropCompleted = false; private boolean mSuppressFolderDeletion = false; @@ -364,12 +363,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList } public void animateOpen() { - if (mFirstOpen) { - setLayerType(LAYER_TYPE_HARDWARE, null); - buildLayer(); - mFirstOpen = false; - } - positionAndSizeAsIcon(); if (!(getParent() instanceof DragLayer)) return; @@ -410,25 +403,14 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList @Override public void onAnimationEnd(Animator animation) { mState = STATE_OPEN; - setLayerType(LAYER_TYPE_NONE, null); - enableHardwareLayersForChildren(); } }); oa.setDuration(mExpandDuration); oa.start(); } - void enableHardwareLayersForChildren() { - ArrayList<View> children = getItemsInReadingOrder(); - for (View child: children) { - child.setLayerType(LAYER_TYPE_HARDWARE, null); - } - } - public void animateClosed() { if (!(getParent() instanceof DragLayer)) return; - setLayerType(LAYER_TYPE_HARDWARE, null); - buildLayer(); ObjectAnimator oa; if (mMode == PARTIAL_GROW) { |