Fix 3511340: Exit widget resize mode when home or back clicked

Also add an optimization to drastically reduce the number of
posted events when a widget is currently being resized.

Change-Id: I8839d4bba564028a67fb0355d35b7dd52465b199

1 files changed, 4 insertions, 3 deletions

diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java
index 37bbb05af..2e72f6223 100644
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/android/launcher2/DragLayer.java
@@ -63,12 +63,13 @@ public class DragLayer extends FrameLayout {
         // dismiss any visible resize frames.
         final Workspace w = (Workspace) findViewById(R.id.workspace);
         final CellLayout currentPage = (CellLayout) w.getChildAt(w.getCurrentPage());
+        final CellLayoutChildren childrenLayout = currentPage.getChildrenLayout();
 
-        if (currentPage.getChildrenLayout().hasResizeFrames()) {
+        if (childrenLayout.hasResizeFrames() && !childrenLayout.isWidgetBeingResized()) {
             post(new Runnable() {
                 public void run() {
-                    if (!currentPage.getChildrenLayout().isWidgetBeingResized()) {
-                        currentPage.getChildrenLayout().clearAllResizeFrames();
+                    if (!childrenLayout.isWidgetBeingResized()) {
+                        childrenLayout.clearAllResizeFrames();
                     }
                 }
             });