Merge "Moving onboarding prefs to use LauncherPrefs" into main (45880312) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -35,9 +35,7 @@ import androidx.core.content.ContextCompat;
		import com.android.launcher3.R;
		import com.android.launcher3.allapps.FloatingHeaderRow;
		import com.android.launcher3.allapps.FloatingHeaderView;
		import com.android.launcher3.util.OnboardingPrefs;
		import com.android.launcher3.util.Themes;
		import com.android.launcher3.views.ActivityContext;

		/**
		* A view which shows a horizontal divider
		@@ -93,10 +91,7 @@ public class AppsDividerView extends View implements FloatingHeaderRow {
		? R.color.all_apps_label_text_dark
		: R.color.all_apps_label_text);

		OnboardingPrefs<?> onboardingPrefs = ActivityContext.lookupContext(
		getContext()).getOnboardingPrefs();
		mShowAllAppsLabel = onboardingPrefs == null \|\| !onboardingPrefs.hasReachedMaxCount(
		ALL_APPS_VISITED_COUNT);
		mShowAllAppsLabel = !ALL_APPS_VISITED_COUNT.hasReachedMax(context);
		}

		public void setup(FloatingHeaderView parent, FloatingHeaderRow[] rows, boolean tabsHidden) {

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
		import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_RANKED;
		import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
		import static com.android.launcher3.util.FlagDebugUtils.appendFlag;
		import static com.android.launcher3.util.OnboardingPrefs.HOTSEAT_LONGPRESS_TIP_SEEN;

		import android.animation.Animator;
		import android.animation.AnimatorSet;
		@@ -41,6 +42,7 @@ import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.DragSource;
		import com.android.launcher3.DropTarget;
		import com.android.launcher3.Hotseat;
		import com.android.launcher3.LauncherPrefs;
		import com.android.launcher3.LauncherSettings;
		import com.android.launcher3.R;
		import com.android.launcher3.anim.AnimationSuccessListener;
		@@ -59,7 +61,6 @@ import com.android.launcher3.testing.shared.TestProtocol;
		import com.android.launcher3.touch.ItemLongClickListener;
		import com.android.launcher3.uioverrides.PredictedAppIcon;
		import com.android.launcher3.uioverrides.QuickstepLauncher;
		import com.android.launcher3.util.OnboardingPrefs;
		import com.android.launcher3.views.Snackbar;

		import java.io.PrintWriter;
		@@ -104,12 +105,11 @@ public class HotseatPredictionController implements DragController.DragListener,
		if (mLauncher.getWorkspace().isSwitchingState()) return false;

		TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "onWorkspaceItemLongClick");
		if (mEnableHotseatLongPressTipForTesting && !mLauncher.getOnboardingPrefs().getBoolean(
		OnboardingPrefs.HOTSEAT_LONGPRESS_TIP_SEEN)) {
		if (mEnableHotseatLongPressTipForTesting && !HOTSEAT_LONGPRESS_TIP_SEEN.get(mLauncher)) {
		Snackbar.show(mLauncher, R.string.hotseat_tip_gaps_filled,
		R.string.hotseat_prediction_settings, null,
		() -> mLauncher.startActivity(getSettingsIntent()));
		mLauncher.getOnboardingPrefs().markChecked(OnboardingPrefs.HOTSEAT_LONGPRESS_TIP_SEEN);
		LauncherPrefs.get(mLauncher).put(HOTSEAT_LONGPRESS_TIP_SEEN, true);
		mLauncher.getDragLayer().performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
		return true;
		}

quickstep/src/com/android/launcher3/secondarydisplay/SecondaryDisplayPredictionsImpl.java

+7 −9

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.content.Context;
		import com.android.launcher3.appprediction.AppsDividerView;
		import com.android.launcher3.appprediction.PredictionRowView;
		import com.android.launcher3.model.BgDataModel;
		import com.android.launcher3.util.OnboardingPrefs;
		import com.android.launcher3.views.ActivityContext;

		/**
		@@ -30,22 +29,21 @@ import com.android.launcher3.views.ActivityContext;
		*/
		@SuppressWarnings("unused")
		public final class SecondaryDisplayPredictionsImpl extends SecondaryDisplayPredictions {

		private final ActivityContext mActivityContext;
		private final Context mContext;

		public SecondaryDisplayPredictionsImpl(Context context) {
		mContext = context;
		mActivityContext = ActivityContext.lookupContext(context);
		}

		@Override
		void updateAppDivider() {
		OnboardingPrefs<?> onboardingPrefs = mActivityContext.getOnboardingPrefs();
		if (onboardingPrefs != null) {
		mActivityContext.getAppsView().getFloatingHeaderView()
		.findFixedRowByType(AppsDividerView.class)
		.setShowAllAppsLabel(
		!onboardingPrefs.hasReachedMaxCount(ALL_APPS_VISITED_COUNT));
		onboardingPrefs.incrementEventCount(ALL_APPS_VISITED_COUNT);
		}
		.setShowAllAppsLabel(!ALL_APPS_VISITED_COUNT.hasReachedMax(mContext));
		ALL_APPS_VISITED_COUNT.increment(mContext);
		}

		@Override

quickstep/src/com/android/launcher3/taskbar/BaseTaskbarContext.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -20,8 +20,6 @@ import android.view.ContextThemeWrapper;
		import android.view.LayoutInflater;

		import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
		import com.android.launcher3.LauncherPrefs;
		import com.android.launcher3.util.OnboardingPrefs;
		import com.android.launcher3.util.Themes;
		import com.android.launcher3.views.ActivityContext;

		@@ -34,12 +32,10 @@ public abstract class BaseTaskbarContext extends ContextThemeWrapper implements

		protected final LayoutInflater mLayoutInflater;
		private final List<OnDeviceProfileChangeListener> mDPChangeListeners = new ArrayList<>();
		private final OnboardingPrefs<BaseTaskbarContext> mOnboardingPrefs;

		public BaseTaskbarContext(Context windowContext) {
		super(windowContext, Themes.getActivityThemeRes(windowContext));
		mLayoutInflater = LayoutInflater.from(this).cloneInContext(this);
		mOnboardingPrefs = new OnboardingPrefs<>(this, LauncherPrefs.getPrefs(this));
		}

		@Override
		@@ -52,11 +48,6 @@ public abstract class BaseTaskbarContext extends ContextThemeWrapper implements
		return mDPChangeListeners;
		}

		@Override
		public OnboardingPrefs<BaseTaskbarContext> getOnboardingPrefs() {
		return mOnboardingPrefs;
		}

		/** Callback invoked when a drag is initiated within this context. */
		public abstract void onDragStart();

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -288,8 +288,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {

		// Persistent features EDU tooltip.
		if (!DisplayController.isTransientTaskbar(mLauncher)) {
		return !mLauncher.getOnboardingPrefs().hasReachedMaxCount(
		OnboardingPrefs.TASKBAR_EDU_TOOLTIP_STEP);
		return !OnboardingPrefs.TASKBAR_EDU_TOOLTIP_STEP.hasReachedMax(mLauncher);
		}

		// Transient swipe EDU tooltip.