From 84da9622d7febb287f80cacf68d6126a1a7d95cc Mon Sep 17 00:00:00 2001 From: Brian Isganitis Date: Thu, 10 Mar 2022 15:27:14 -0800 Subject: [PATCH] Close taskbar all apps on popup notification and app info shortcut tap. Test: Manual Fix: 223659756 Change-Id: I84fd8cd84ccdce5f51874d7356cafac9bfa92004 --- src/com/android/launcher3/AbstractFloatingView.java | 2 +- src/com/android/launcher3/notification/NotificationInfo.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index ceb38d0e77..e75348cc55 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -103,7 +103,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_ALL_APPS_EDU | TYPE_ICON_SURFACE | TYPE_WIDGETS_EDUCATION_DIALOG - | TYPE_TASKBAR_EDUCATION_DIALOG | TYPE_TASKBAR_ALL_APPS; + | TYPE_TASKBAR_EDUCATION_DIALOG; // Usually we show the back button when a floating view is open. Instead, hide for these types. public static final int TYPE_HIDE_BACK_BUTTON = TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE diff --git a/src/com/android/launcher3/notification/NotificationInfo.java b/src/com/android/launcher3/notification/NotificationInfo.java index ebe45a55f0..bb2c37f131 100644 --- a/src/com/android/launcher3/notification/NotificationInfo.java +++ b/src/com/android/launcher3/notification/NotificationInfo.java @@ -16,6 +16,8 @@ package com.android.launcher3.notification; +import static com.android.launcher3.AbstractFloatingView.TYPE_ACTION_POPUP; +import static com.android.launcher3.AbstractFloatingView.TYPE_TASKBAR_ALL_APPS; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_LAUNCH_TAP; import android.app.ActivityOptions; @@ -116,7 +118,8 @@ public class NotificationInfo implements View.OnClickListener { popupDataProvider.cancelNotification(notificationKey); } } - AbstractFloatingView.closeOpenContainer(context, AbstractFloatingView.TYPE_ACTION_POPUP); + AbstractFloatingView.closeOpenViews( + context, true, TYPE_ACTION_POPUP | TYPE_TASKBAR_ALL_APPS); } public Drawable getIconForBackground(Context context, int background) {