diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-24 04:53:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 04:53:21 +0000 |
| commit | 97f8ed6213a26dcb385722e89f34b3a96cd119f7 (patch) | |
| tree | fa3412150c4df30bbc021e4f1819ae5a8a5ccefa | |
| parent | cfd8939aa2d240513a966254b6f87dec5b4233f1 (diff) | |
| parent | d6cd14d1792107c5ff609edb1f3bb65f525abba8 (diff) | |
| download | Launcher3-97f8ed6213a26dcb385722e89f34b3a96cd119f7.tar.gz | |
Merge "Remove hotseat edu flag" into rvc-dev am: d6cd14d179
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11979630
Change-Id: I358af2c9d01215d6c3f4b43d3f25c8ac3ff5ea97
2 files changed, 1 insertions, 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 @@ -155,14 +155,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. */ public void showEdu() { @@ -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, |