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

Commit 380b4403 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add phone switching status for account match success" into main

parents 6da7b560 b0c46f1c

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -20163,6 +20163,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(