diff options
| author | Tony Wickham <twickham@google.com> | 2017-05-02 21:11:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-02 21:11:22 +0000 |
| commit | 0228b32ce0ad3a1d98d74e55c6b9615b8d19a6ac (patch) | |
| tree | 9edb3e72df8ccb0d2f92db9fe8eb4942d912b721 /src/com/android/launcher3/popup | |
| parent | 45cc90f0be4c87f0696e857313d9b2aaf34469ed (diff) | |
| parent | 2bb1e74ccf780cf514e25eaa349448cf318de42f (diff) | |
| download | android_packages_apps_Trebuchet-0228b32ce0ad3a1d98d74e55c6b9615b8d19a6ac.tar.gz android_packages_apps_Trebuchet-0228b32ce0ad3a1d98d74e55c6b9615b8d19a6ac.tar.bz2 android_packages_apps_Trebuchet-0228b32ce0ad3a1d98d74e55c6b9615b8d19a6ac.zip | |
Merge "Close Folder when opening WidgetsBottomSheet" into ub-launcher3-dorval
am: 2bb1e74ccf
Change-Id: I6442f823d6c276add4ddb2275c5ed20aad8b29e4
Diffstat (limited to 'src/com/android/launcher3/popup')
| -rw-r--r-- | src/com/android/launcher3/popup/SystemShortcut.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java index 9caf98c2f..6747540eb 100644 --- a/src/com/android/launcher3/popup/SystemShortcut.java +++ b/src/com/android/launcher3/popup/SystemShortcut.java @@ -4,6 +4,7 @@ import android.content.Context; 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 @@ public abstract class SystemShortcut { 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); |