diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-07-11 17:53:37 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2011-07-11 18:37:16 -0700 |
| commit | 4eac29a80b9a73465c8de54f1caec2a8098a73c6 (patch) | |
| tree | ad6e6a7c9ec5da36462a04d329ef5a00b9fb10f1 /src/com/android/launcher2/Folder.java | |
| parent | 51e95039ac40f94de024413a6e7fb1e18d41ef19 (diff) | |
| download | android_packages_apps_Trebuchet-4eac29a80b9a73465c8de54f1caec2a8098a73c6.tar.gz android_packages_apps_Trebuchet-4eac29a80b9a73465c8de54f1caec2a8098a73c6.tar.bz2 android_packages_apps_Trebuchet-4eac29a80b9a73465c8de54f1caec2a8098a73c6.zip | |
Fixing bug 5011917 - clearing refernce to old folders from FolderInfo
-> Also, ensured that unbind() gets called on all ItemInfos on rotate
Change-Id: I869b68fcae5c66702ec204596f5ecabdc7a32df7
Diffstat (limited to 'src/com/android/launcher2/Folder.java')
| -rw-r--r-- | src/com/android/launcher2/Folder.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index 788d4b9bc..78df80fb3 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -54,14 +54,12 @@ import java.util.ArrayList; public class Folder extends LinearLayout implements DragSource, View.OnClickListener, View.OnLongClickListener, DropTarget, FolderListener, TextView.OnEditorActionListener { - protected DragController mDragController; + private static final String TAG = "Launcher.Folder"; + protected DragController mDragController; protected Launcher mLauncher; - protected FolderInfo mInfo; - private static final String TAG = "Launcher.Folder"; - static final int STATE_NONE = -1; static final int STATE_SMALL = 0; static final int STATE_ANIMATING = 1; @@ -132,6 +130,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList if (sHintText == null) { sHintText = res.getString(R.string.folder_hint_text); } + + mLauncher = (Launcher) context; } @Override @@ -286,10 +286,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList mDragController = dragController; } - void setLauncher(Launcher launcher) { - mLauncher = launcher; - } - void setFolderIcon(FolderIcon icon) { mFolderIcon = icon; } |