commit 5c7e6c258e06224c7c0d315f8c5b30eac4b2f9e5
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 05 18:47:54 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 05 18:47:54 2018 +0000
tree 5948fd35b91dcd7f033546d2a2ad39ae1e621627
parent 00b8ac837118b91914b669103d46104720294424
parent fcb7e19f67deaadbb535c074a445568ebb4ec898

Merge "Close options popup when rebinding launcher." into ub-launcher3-master

src/com/android/launcher3/AbstractFloatingView.java

diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index f34cf0d..b0c5baf 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -68,7 +68,7 @@
 
     // Type of popups which should be kept open during launcher rebind
     public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET
-            | TYPE_QUICKSTEP_PREVIEW | TYPE_ON_BOARD_POPUP | TYPE_OPTIONS_POPUP;
+            | TYPE_QUICKSTEP_PREVIEW | TYPE_ON_BOARD_POPUP;
 
     protected boolean mIsOpen;