Fixing issue where dragging final items out of hot seat folder can causes inconsistency issue.

- Fixing restoring of workspace screens on rotation (and flash of custom content page indicator)
- Fixing NPE on long pressing on empty screen to go into overview mode

1 files changed, 12 insertions, 0 deletions

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index ba18b8de7..d33e65041 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -567,6 +567,18 @@ public class Workspace extends SmoothPagedView
         return -1;
     }
 
+    public boolean hasNonCustomEmptyScreens() {
+        Log.w(TAG, "10249126 - hasNonCustomEmptyScreens()");
+        Iterator<Long> iter = mWorkspaceScreens.keySet().iterator();
+        while (iter.hasNext()) {
+            long id = iter.next();
+            if (id >= 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     ArrayList<Long> getScreenOrder() {
         return mScreenOrder;
     }