From 6293af557571354be799b7736724dc2df5a043bf Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Tue, 23 Jun 2020 12:53:37 -0700 Subject: [PATCH] Remove hotseat edu flag Launcher should not restrict user migration to a one time event if we want users to migrate their hotseat by enabling hotseat prediction from suggestion settings. Test: Manual Bug: 159731272 Change-Id: I0e42dd6b6cf6374928e5b399d121d17fe8024ae1 --- .../launcher3/hybridhotseat/HotseatEduController.java | 2 -- .../hybridhotseat/HotseatPredictionController.java | 10 +--------- 2 files changed, 1 insertion(+), 11 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 a1218aeb86..4f95254a72 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 @@ -47,7 +47,6 @@ import java.util.stream.IntStream; */ public class HotseatEduController { - public static final String KEY_HOTSEAT_EDU_SEEN = "hotseat_edu_seen"; public static final String HOTSEAT_EDU_ACTION = "com.android.launcher3.action.SHOW_HYBRID_HOTSEAT_EDU"; public static final String SETTINGS_ACTION = @@ -229,7 +228,6 @@ public class HotseatEduController { void finishOnboarding() { mOnOnboardingComplete.run(); - mLauncher.getSharedPrefs().edit().putBoolean(KEY_HOTSEAT_EDU_SEEN, true).apply(); } void showDimissTip() { 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 7334d80dd6..1dbb9e2d6b 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 @@ -154,14 +154,6 @@ public class HotseatPredictionController implements DragController.DragListener, } } - /** - * Returns whether or not user has seen hybrid hotseat education - */ - public boolean isEduSeen() { - return mLauncher.getSharedPrefs().getBoolean(HotseatEduController.KEY_HOTSEAT_EDU_SEEN, - false); - } - /** * Shows appropriate hotseat education based on prediction enabled and migration states. */ @@ -172,7 +164,7 @@ public class HotseatPredictionController implements DragController.DragListener, Snackbar.show(mLauncher, R.string.hotsaet_tip_prediction_disabled, R.string.hotseat_prediction_settings, null, () -> mLauncher.startActivity(getSettingsIntent())); - } else if (isEduSeen() || getPredictedIcons().size() >= (mHotSeatItemsCount + 1) / 2) { + } else if (getPredictedIcons().size() >= (mHotSeatItemsCount + 1) / 2) { showDiscoveryTip(); } else { HotseatEduController eduController = new HotseatEduController(mLauncher,