Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97f8ed62 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove hotseat edu flag" into rvc-dev am: d6cd14d1 

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

Change-Id: I358af2c9d01215d6c3f4b43d3f25c8ac3ff5ea97
parents cfd8939a d6cd14d1

quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java

+0 −2
Original line number Diff line number Diff line
@@ -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() {

quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java

+1 −9
Original line number Diff line number Diff line
@@ -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,