summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Ng <ngmatthew@google.com>2018-07-13 17:00:24 -0700
committerMatthew Ng <ngmatthew@google.com>2018-07-13 17:00:24 -0700
commit00fec0d53b7f5ef08f0382337b3b028ca5eb1de2 (patch)
tree8e38b1b38d6220c918951d0dc2cea5ffcf997a09
parent35a6848fa813b6b3d5c41b2b6792f7b7effa195b (diff)
downloadandroid_packages_apps_Trebuchet-00fec0d53b7f5ef08f0382337b3b028ca5eb1de2.tar.gz
android_packages_apps_Trebuchet-00fec0d53b7f5ef08f0382337b3b028ca5eb1de2.tar.bz2
android_packages_apps_Trebuchet-00fec0d53b7f5ef08f0382337b3b028ca5eb1de2.zip
App menu icon launching app info hides taskview menu
Change-Id: I0b493229d18027adbb7c1ee15b38d859e0b3a434 Fixes: 111405044 Test: go to overview, tap icon, tap app info
-rw-r--r--quickstep/src/com/android/quickstep/TaskSystemShortcut.java6
-rw-r--r--src/com/android/launcher3/popup/SystemShortcut.java6
2 files changed, 6 insertions, 6 deletions
diff --git a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
index 5a6312d4e..e5a2b5e25 100644
--- a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
@@ -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);
- }
}
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index 3c1cc9057..693e53242 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -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);
+ }
}