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

Commit b0c46f1c authored Oct 02, 2024 by Julie Kim

Add phone switching status for account match success

This status will be tracked in order to remove the cancel button for the
phone switching flow in the case that account matching is already
successful.

Bug: 348972325
Test: manual build
Flag: com.google.android.wearable.setupwizard.flags.remove_phone_switching_cancel_on_account_match
Change-Id: Id0baad1f415e0f17c6ee56daeee1296663570381

parent f87fc38d

core/java/android/provider/Settings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -20232,6 +20232,12 @@ public final class Settings {
		*/
		public static final int PHONE_SWITCHING_STATUS_IN_PROGRESS_MIGRATION_SUCCESS = 11;

		/**
		* Phone switching has finished account match step.
		* @hide
		*/
		public static final int PHONE_SWITCHING_STATUS_ACCOUNTS_MATCHED = 12;

		/**
		* Phone switching request source
		* @hide

packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -434,7 +434,7 @@ public class GlobalSettingsValidators {
		VALIDATORS.put(Global.Wearable.PHONE_SWITCHING_STATUS,
		new InclusiveIntegerRangeValidator(
		Global.Wearable.PHONE_SWITCHING_STATUS_NOT_STARTED,
		Global.Wearable.PHONE_SWITCHING_STATUS_IN_PROGRESS_MIGRATION_SUCCESS));
		Global.Wearable.PHONE_SWITCHING_STATUS_ACCOUNTS_MATCHED));
		VALIDATORS.put(Global.Wearable.REDUCE_MOTION, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.RTL_SWIPE_TO_DISMISS_ENABLED_DEV, BOOLEAN_VALIDATOR);
		VALIDATORS.put(