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

Commit 080f9326 authored by Fengjiang Li's avatar Fengjiang Li
Browse files

Handle nullable CellLayout when removing app icon from folder 

If CellLayout is null, instead of early return that will lead app icon not clickable, we should fallback to use Launcher as activity

Fix: 290973455
Test: attached to video
Change-Id: I10b03f3f41dd672116133af83ae8a5b066824d71
parent fc681dbe

src/com/android/launcher3/Launcher.java

+4 −3
Original line number Diff line number Diff line
@@ -1402,8 +1402,9 @@ public class Launcher extends StatefulActivity<LauncherState> 
     * @param info   The data structure describing the shortcut.

     * @return A View inflated from layoutResId.

     */

    public View createShortcut(ViewGroup parent, WorkspaceItemInfo info) {

        BubbleTextView favorite = (BubbleTextView) LayoutInflater.from(parent.getContext())

    public View createShortcut(@Nullable ViewGroup parent, WorkspaceItemInfo info) {

        BubbleTextView favorite =

                (BubbleTextView) LayoutInflater.from(parent != null ? parent.getContext() : this)

                        .inflate(R.layout.app_icon, parent, false);

        favorite.applyFromWorkspaceItem(info);

        favorite.setOnClickListener(getItemOnClickListener());

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

+0 −3
Original line number Diff line number Diff line
@@ -94,9 +94,6 @@ public class LauncherDelegate { 
                        // folder

                        CellLayout cellLayout = mLauncher.getCellLayout(info.container,

                                mLauncher.getCellPosMapper().mapModelToPresenter(info).screenId);

                        if (cellLayout == null) {

                            return;

                        }

                        finalItem =  info.contents.remove(0);

                        newIcon = mLauncher.createShortcut(cellLayout, finalItem);

                        mLauncher.getModelWriter().addOrMoveItemInDatabase(finalItem,