diff options
| author | Dan Sandler <dsandler@android.com> | 2014-01-13 15:35:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-13 15:35:40 +0000 |
| commit | 0b95b14ffe800ac3ddccae38bfcd48ebcbc7a2a5 (patch) | |
| tree | e2ed0c960ff7183b04448d1674ef276eadf7d684 /src/com/android/launcher3/Folder.java | |
| parent | 5317c2b7adfbfef97edc6ad9b7e007160ef689f4 (diff) | |
| parent | 0eb687fdc431e7eae4e8f2f4d5dd3a6e48779008 (diff) | |
| download | android_packages_apps_Trebuchet-0b95b14ffe800ac3ddccae38bfcd48ebcbc7a2a5.tar.gz android_packages_apps_Trebuchet-0b95b14ffe800ac3ddccae38bfcd48ebcbc7a2a5.tar.bz2 android_packages_apps_Trebuchet-0b95b14ffe800ac3ddccae38bfcd48ebcbc7a2a5.zip | |
Merge "Quick patch for b/12446428." into jb-ub-now-kermit
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 95038b67d..a9134e105 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -1107,7 +1107,10 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList if (getItemCount() <= 1) { // Remove the folder LauncherModel.deleteItemFromDatabase(mLauncher, mInfo); - cellLayout.removeView(mFolderIcon); + if (cellLayout != null) { + // b/12446428 -- sometimes the cell layout has already gone away? + cellLayout.removeView(mFolderIcon); + } if (mFolderIcon instanceof DropTarget) { mDragController.removeDropTarget((DropTarget) mFolderIcon); } |