commit dc2d707a386e76647a33529421beba4d7af57534
author Tony Wickham <twickham@google.com> Tue May 02 21:09:25 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 02 21:09:27 2017 +0000
tree 4bf79be1bcf3130030fc05d4495d229856d95115
parent ce70768d50f9880e05df8d95dfe8a59df6741aa7
parent 84b32ceb5cbb22568d2cd24a52d08abb017146f3

Merge changes from topic 'am-c58363b2-325e-41bd-baab-3a46a1cb158f' into ub-launcher3-master

* changes:
  Handle back-to-back height reduction animations am: 24ba787ded
  Handle back-to-back height reduction animations

src/com/android/launcher3/popup/SystemShortcut.java

diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index 9caf98c..6747540 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -4,6 +4,7 @@
 import android.graphics.drawable.Drawable;
 import android.view.View;
 
+import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.InfoDropTarget;
 import com.android.launcher3.ItemInfo;
 import com.android.launcher3.Launcher;
@@ -58,7 +59,7 @@
             return new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    PopupContainerWithArrow.getOpen(launcher).close(true);
+                    AbstractFloatingView.closeAllOpenViews(launcher);
                     WidgetsBottomSheet widgetsBottomSheet =
                             (WidgetsBottomSheet) launcher.getLayoutInflater().inflate(
                                     R.layout.widgets_bottom_sheet, launcher.getDragLayer(), false);