From c376a1de2c942703ef8fe4095fe9f4bf6d2c39a7 Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Thu, 18 Jun 2020 13:10:37 -0700 Subject: [PATCH] Add flag Intent.FLAG_ACTIVITY_NEW_TASK when launching suggestion settings Bug: 158604370 Test: Manual Change-Id: I01e313d29cbc9b7ea2413547d9a7b4940d126ce8 --- .../launcher3/hybridhotseat/HotseatEduController.java | 8 ++++++-- .../hybridhotseat/HotseatPredictionController.java | 8 +++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java index 522a2dc969..c1bf2fd960 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java @@ -84,7 +84,7 @@ public class HotseatEduController { } Snackbar.show(mLauncher, R.string.hotsaet_tip_prediction_enabled, R.string.hotseat_prediction_settings, null, - () -> mLauncher.startActivity(new Intent(SETTINGS_ACTION))); + () -> mLauncher.startActivity(getSettingsIntent())); } /** @@ -237,7 +237,7 @@ public class HotseatEduController { < mLauncher.getDeviceProfile().inv.numHotseatIcons) { Snackbar.show(mLauncher, R.string.hotseat_tip_gaps_filled, R.string.hotseat_prediction_settings, null, - () -> mLauncher.startActivity(new Intent(SETTINGS_ACTION))); + () -> mLauncher.startActivity(getSettingsIntent())); } else { new ArrowTipView(mLauncher).show( mLauncher.getString(R.string.hotseat_tip_no_empty_slots), mHotseat.getTop()); @@ -281,5 +281,9 @@ public class HotseatEduController { mActiveDialog.setHotseatEduController(this); mActiveDialog.show(mPredictedApps); } + + static Intent getSettingsIntent() { + return new Intent(SETTINGS_ACTION).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + } } diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java index 30a34e46eb..296f1dc745 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java @@ -17,7 +17,7 @@ package com.android.launcher3.hybridhotseat; import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_GRID; import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY; -import static com.android.launcher3.hybridhotseat.HotseatEduController.SETTINGS_ACTION; +import static com.android.launcher3.hybridhotseat.HotseatEduController.getSettingsIntent; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_RANKED; import android.animation.Animator; @@ -29,7 +29,6 @@ import android.app.prediction.AppPredictor; import android.app.prediction.AppTarget; import android.app.prediction.AppTargetEvent; import android.content.ComponentName; -import android.content.Intent; import android.os.Process; import android.util.Log; import android.view.View; @@ -158,8 +157,7 @@ public class HotseatPredictionController implements DragController.DragListener, // launcher has empty predictions set Snackbar.show(mLauncher, R.string.hotsaet_tip_prediction_disabled, R.string.hotseat_prediction_settings, null, - () -> mLauncher.startActivity( - new Intent(SETTINGS_ACTION))); + () -> mLauncher.startActivity(getSettingsIntent())); } else if (isEduSeen()) { // user has already went through education new ArrowTipView(mLauncher).show( @@ -183,7 +181,7 @@ public class HotseatPredictionController implements DragController.DragListener, } else { Snackbar.show(mLauncher, R.string.hotseat_tip_gaps_filled, R.string.hotseat_prediction_settings, null, - () -> mLauncher.startActivity(new Intent(SETTINGS_ACTION))); + () -> mLauncher.startActivity(HotseatEduController.getSettingsIntent())); } }