Merge "Close taskbar all apps on popup notification and app info shortcut tap." into tm-dev (8dff7ca8) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/AbstractFloatingView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+4 −1

Original line number	Diff line number	Diff line
		@@ -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) {