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, 3 insertions, 0 deletions

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 3e0fcd5d2..994c3b825 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1482,6 +1482,7 @@ public final class Launcher extends Activity
                 mWorkspace.unshrink(alreadyOnHome);
             }
 
+            mWorkspace.exitWidgetResizeMode();
             if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isTouchActive()) {
                 mWorkspace.moveToDefaultScreen(true);
             }
@@ -2020,6 +2021,8 @@ public final class Launcher extends Activity
             dismissPreview(mPreviousView);
             dismissPreview(mNextView);
         } else {
+            mWorkspace.exitWidgetResizeMode();
+
             // Back button is a no-op here, but give at least some feedback for the button press
             mWorkspace.showOutlinesTemporarily();
         }