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

Commit 1f8cbcf1 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] App menu icon launching app info hides taskview menu am: 00fec0d5 

Change-Id: I9a9367b8c6f41aba000f842df7d44171392639ec
parents 32f91ab9 00fec0d5

quickstep/src/com/android/quickstep/TaskSystemShortcut.java

+0 −6
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.os.UserHandle; 
import android.util.Log;

import android.view.View;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.ItemInfo;
@@ -270,9 +269,4 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut 
            return null;

        }

    }



    private static void dismissTaskMenuView(BaseDraggingActivity activity) {

        AbstractFloatingView.closeOpenViews(activity, true,

                AbstractFloatingView.TYPE_ALL & ~AbstractFloatingView.TYPE_REBIND_SAFE);

    }

}

src/com/android/launcher3/popup/SystemShortcut.java

+6 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite 
        public View.OnClickListener getOnClickListener(

                BaseDraggingActivity activity, ItemInfo itemInfo) {

            return (view) -> {

                dismissTaskMenuView(activity);

                Rect sourceBounds = activity.getViewBounds(view);

                Bundle opts = activity.getActivityLaunchOptionsAsBundle(view);

                new PackageManagerHelper(activity).startDetailsActivityForInfo(
@@ -117,4 +118,9 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite 
            };

        }

    }



    protected static void dismissTaskMenuView(BaseDraggingActivity activity) {

        AbstractFloatingView.closeOpenViews(activity, true,

            AbstractFloatingView.TYPE_ALL & ~AbstractFloatingView.TYPE_REBIND_SAFE);

    }

}