Port remote folder fixes from cm13.

Change-Id: I6d0982124fd78de6153d67939ab6c03fb5d10e14

4 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/launcher3/CheckLongPressHelper.java b/src/com/android/launcher3/CheckLongPressHelper.java
index 81149793d..1712acdb7 100644
--- a/src/com/android/launcher3/CheckLongPressHelper.java
+++ b/src/com/android/launcher3/CheckLongPressHelper.java
@@ -25,6 +25,8 @@ public class CheckLongPressHelper {
 
     class CheckForLongPress implements Runnable {
         public void run() {
+            if (!mView.isLongClickable()) return;
+
             if ((mView.getParent() != null) && mView.hasWindowFocus()
                     && !mHasPerformedLongPress) {
                 if (mView.performLongClick()) {
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 2a38c4674..842c0ae34 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -562,6 +562,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
     }
 
     private void prepareFakeFolderIcon() {
+        mFolderIcon.destroyDrawingCache();
         mFolderIcon.buildDrawingCache(true);
 
         Bitmap fakeFolderIcon = Bitmap.createBitmap(mFolderIcon.getDrawingCache());
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e73520850..51222d0fc 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -395,7 +395,7 @@ public class Launcher extends Activity
     private Canvas mFolderIconCanvas;
     private Rect mRectForFolderAnimation = new Rect();
 
-    private BubbleTextView mWaitingForResume;
+    BubbleTextView mWaitingForResume;
 
     // Search widget
     int mSearchWidgetId;
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index e98f12f6e..2c28330b2 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4464,6 +4464,7 @@ public class Workspace extends SmoothPagedView
             if (cellLayout != null) {
                 cellLayout.onDropChild(mDragInfo.cell);
                 cellLayout.setUseTempCoords(false);
+                ((CellLayout.LayoutParams) target.getLayoutParams()).useTmpCoords = false;
             }
         }
         if ((d.cancelled || (beingCalledAfterUninstall && !mUninstallSuccessful))