Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8c647ff authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Fix back button not showing in all floating views" into ub-launcher3-master

parents 6b34edcc b65040ac

src/com/android/launcher3/folder/Folder.java

+2 −2
Original line number Diff line number Diff line
@@ -481,6 +481,8 @@ public class Folder extends AbstractFloatingView implements DragSource, 
            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 @@ public class Folder extends AbstractFloatingView implements DragSource, 
            }

        }



        mIsOpen = true;



        mContent.completePendingPageChanges();

        if (!mDragInProgress) {

            // Open on the first page.

src/com/android/launcher3/views/OptionsPopupView.java

+1 −1
Original line number Diff line number Diff line
@@ -288,8 +288,8 @@ public class OptionsPopupView extends AbstractFloatingView 
        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) {