commit 0228b32ce0ad3a1d98d74e55c6b9615b8d19a6ac
author Tony Wickham <twickham@google.com> Tue May 02 21:11:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 02 21:11:22 2017 +0000
tree 9edb3e72df8ccb0d2f92db9fe8eb4942d912b721
parent 45cc90f0be4c87f0696e857313d9b2aaf34469ed
parent 2bb1e74ccf780cf514e25eaa349448cf318de42f

Merge "Close Folder when opening WidgetsBottomSheet" into ub-launcher3-dorval
am: 2bb1e74ccf

Change-Id: I6442f823d6c276add4ddb2275c5ed20aad8b29e4

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);