Merge "Fix back button not showing in all floating views" into ub-launcher3-master
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 1bdd554..12d7dc7 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -481,6 +481,8 @@
openFolder.close(true);
}
+ mIsOpen = true;
+
DragLayer dragLayer = mLauncher.getDragLayer();
// Just verify that the folder hasn't already been added to the DragLayer.
// There was a one-off crash where the folder had a parent already.
@@ -494,8 +496,6 @@
}
}
- mIsOpen = true;
-
mContent.completePendingPageChanges();
if (!mDragInProgress) {
// Open on the first page.
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index 21b6773..dc86aec 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -288,8 +288,8 @@
lp.y = Utilities.boundToRange((int) (y - height / 2), insets.top + margin,
maxHeight - insets.bottom - height - margin);
- launcher.getDragLayer().addView(view);
view.animateOpen();
+ launcher.getDragLayer().addView(view);
}
public static boolean onWidgetsClicked(Launcher launcher) {