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

Commit 4a44b6e5 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Optimizing open shortcuts container lookep" into ub-launcher3-calgary

parents 5aa27149 71b3d1c3

src/com/android/launcher3/Launcher.java

+9 −1
Original line number Diff line number Diff line
@@ -3133,7 +3133,15 @@ public class Launcher extends Activity 
     * @return The open shortcuts container, or null if there is none

     */

    public DeepShortcutsContainer getOpenShortcutsContainer() {

        return (DeepShortcutsContainer) mDragLayer.findViewById(R.id.deep_shortcuts_container);

        // Iterate in reverse order. Shortcuts container is added later to the dragLayer,

        // and will be one of the last views.

        for (int i = mDragLayer.getChildCount() - 1; i >= 0; i--) {

            View child = mDragLayer.getChildAt(i);

            if (child instanceof DeepShortcutsContainer) {

                return (DeepShortcutsContainer) child;

            }

        }

        return null;

    }



    @Override

src/com/android/launcher3/Workspace.java

+3 −2
Original line number Diff line number Diff line
@@ -532,8 +532,9 @@ public class Workspace extends PagedView 
     */

    public Folder getOpenFolder() {

        DragLayer dragLayer = mLauncher.getDragLayer();

        int count = dragLayer.getChildCount();

        for (int i = 0; i < count; i++) {

        // Iterate in reverse order. Folder is added later to the dragLayer,

        // and will be one of the last views.

        for (int i = dragLayer.getChildCount() - 1; i >= 0; i--) {

            View child = dragLayer.getChildAt(i);

            if (child instanceof Folder) {

                Folder folder = (Folder) child;