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

Commit 120c99f4 authored by Federico Baron's avatar Federico Baron Committed by Android (Google) Code Review
Browse files

Merge "Tapping on a "folder" on the Homescreen right after returning home... 

Merge "Tapping on a "folder" on the Homescreen right after returning home results in it starting to open, then canceling." into tm-qpr-dev
parents 0c853991 8bf1bca5

src/com/android/launcher3/Launcher.java

+27 −9
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ import com.android.launcher3.dragndrop.DragLayer; 
import com.android.launcher3.dragndrop.DragOptions;

import com.android.launcher3.dragndrop.DragView;

import com.android.launcher3.dragndrop.LauncherDragController;

import com.android.launcher3.folder.Folder;

import com.android.launcher3.folder.FolderGridOrganizer;

import com.android.launcher3.folder.FolderIcon;

import com.android.launcher3.icons.BitmapRenderer;
@@ -1192,7 +1193,6 @@ public class Launcher extends StatefulActivity<LauncherState> 
            mOverlayManager.onActivityResumed(this);

        }



        AbstractFloatingView.closeAllOpenViewsExcept(this, false, TYPE_REBIND_SAFE);

        DragView.removeAllViews(this);

        TraceHelper.INSTANCE.endSection(traceToken);

    }
@@ -1705,6 +1705,10 @@ public class Launcher extends StatefulActivity<LauncherState> 
            outState.remove(RUNTIME_STATE_WIDGET_PANEL);

        }



        // We close any open folders and shortcut containers that are not safe for rebind,

        // and we need to make sure this state is reflected.

        AbstractFloatingView.closeAllOpenViewsExcept(

                this, isStarted() && !isForceInvisible(), TYPE_REBIND_SAFE);

        finishAutoCancelActionMode();



        if (mPendingRequestArgs != null) {
@@ -2815,7 +2819,22 @@ public class Launcher extends StatefulActivity<LauncherState> 
            }



            return v;

        }



        // Look for the item inside the folder at the current page

        Folder folder = Folder.getOpen(this);

        if (folder != null) {

            View v = getFirstMatch(Collections.singletonList(

                    folder.getContent().getCurrentCellLayout().getShortcutsAndWidgets()),

                    preferredItem,

                    packageAndUserAndApp);

            if (v == null) {

                folder.close(isStarted() && !isForceInvisible());

            } else {

                return v;

            }

        }



        List<ViewGroup> containers = new ArrayList<>(mWorkspace.getPanelCount() + 1);

        containers.add(mWorkspace.getHotseat().getShortcutsAndWidgets());

        mWorkspace.forEachVisiblePage(page
@@ -2825,7 +2844,6 @@ public class Launcher extends StatefulActivity<LauncherState> 
        return getFirstMatch(containers, preferredItem, forFolderMatch(preferredItem),

                packageAndUserAndApp, forFolderMatch(packageAndUserAndApp));

    }

    }



    /**

     * Finds the first view matching the ordered operators across the given viewgroups in order.