commit 2bb1e74ccf780cf514e25eaa349448cf318de42f
author Tony Wickham <twickham@google.com> Tue May 02 21:05:05 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 02 21:05:07 2017 +0000
tree eaf96d6b3d17246849fd90cc2dae185a0b2f1f03
parent da8261cce3f210559d6e8278de28b1276139e39a
parent 8897b4167e7f3761ce477cac7699093dcd0782da

Merge "Close Folder when opening WidgetsBottomSheet" into ub-launcher3-dorval

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 e48e349..81460e4 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;
@@ -60,7 +61,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);