PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove hotseat edu flag" into rvc-dev am: d6cd14d179 am: e65a33134d am: 373d9f4d88

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11979630

Change-Id: I38d22283c4e8714067ebfc2c82c332a6836008b8
This commit is contained in:
TreeHugger Robot
2020-06-24 05:15:38 +00:00
committed by Automerger Merge Worker
parent 8923ae316b 373d9f4d88
commit fc8bfcf97f
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java
-2
View File
@@ -47,7 +47,6 @@ import java.util.stream.IntStream;
*/ */
public class HotseatEduController { public class HotseatEduController {
public static final String KEY_HOTSEAT_EDU_SEEN = "hotseat_edu_seen";
public static final String HOTSEAT_EDU_ACTION = public static final String HOTSEAT_EDU_ACTION =
"com.android.launcher3.action.SHOW_HYBRID_HOTSEAT_EDU"; "com.android.launcher3.action.SHOW_HYBRID_HOTSEAT_EDU";
public static final String SETTINGS_ACTION = public static final String SETTINGS_ACTION =
@@ -229,7 +228,6 @@ public class HotseatEduController {
void finishOnboarding() { void finishOnboarding() {
mOnOnboardingComplete.run(); mOnOnboardingComplete.run();
mLauncher.getSharedPrefs().edit().putBoolean(KEY_HOTSEAT_EDU_SEEN, true).apply();
} }
void showDimissTip() { void showDimissTip() {
quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+1 -9
View File
@@ -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. * 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, Snackbar.show(mLauncher, R.string.hotsaet_tip_prediction_disabled,
R.string.hotseat_prediction_settings, null, R.string.hotseat_prediction_settings, null,
() -> mLauncher.startActivity(getSettingsIntent())); () -> mLauncher.startActivity(getSettingsIntent()));
} else if (isEduSeen() || getPredictedIcons().size() >= (mHotSeatItemsCount + 1) / 2) { } else if (getPredictedIcons().size() >= (mHotSeatItemsCount + 1) / 2) {
showDiscoveryTip(); showDiscoveryTip();
} else { } else {
HotseatEduController eduController = new HotseatEduController(mLauncher, HotseatEduController eduController = new HotseatEduController(mLauncher,