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

Commit 0f5461ca authored by Vania Januar's avatar Vania Januar Committed by Android (Google) Code Review
Browse files

Merge "Backup stylus and note-taking related settings." into main

parents 0cca1c88 24f2554b

packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java

+4 −1
Original line number Diff line number Diff line
@@ -245,6 +245,9 @@ public class SecureSettings { 
        Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED,

        Settings.Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED,

        Settings.Secure.SEARCH_LONG_PRESS_HOME_ENABLED,

        Settings.Secure.HUB_MODE_TUTORIAL_STATE

        Settings.Secure.HUB_MODE_TUTORIAL_STATE,

        Settings.Secure.STYLUS_BUTTONS_ENABLED,

        Settings.Secure.STYLUS_HANDWRITING_ENABLED,

        Settings.Secure.DEFAULT_NOTE_TASK_PROFILE

    };

}

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

+4 −0
Original line number Diff line number Diff line
@@ -394,5 +394,9 @@ public class SecureSettingsValidators { 
                BOOLEAN_VALIDATOR);

        VALIDATORS.put(Secure.DND_CONFIGS_MIGRATED, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Secure.HUB_MODE_TUTORIAL_STATE, NON_NEGATIVE_INTEGER_VALIDATOR);

        VALIDATORS.put(Secure.STYLUS_BUTTONS_ENABLED, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Secure.STYLUS_HANDWRITING_ENABLED,

                new DiscreteValueValidator(new String[] {"-1", "0", "1"}));

        VALIDATORS.put(Secure.DEFAULT_NOTE_TASK_PROFILE, NON_NEGATIVE_INTEGER_VALIDATOR);

    }

}

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+0 −3
Original line number Diff line number Diff line
@@ -735,7 +735,6 @@ public class SettingsBackupTest { 
                 Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS,

                 Settings.Secure.CONTENT_CAPTURE_ENABLED,

                 Settings.Secure.DEFAULT_INPUT_METHOD,

                 Settings.Secure.DEFAULT_NOTE_TASK_PROFILE,

                 Settings.Secure.DEVICE_PAIRED,

                 Settings.Secure.DIALER_DEFAULT_APPLICATION,

                 Settings.Secure.DISABLED_PRINT_SERVICES,
@@ -805,8 +804,6 @@ public class SettingsBackupTest { 
                 Settings.Secure.SLEEP_TIMEOUT,

                 Settings.Secure.SMS_DEFAULT_APPLICATION,

                 Settings.Secure.SPELL_CHECKER_ENABLED,  // Intentionally removed in Q

                 Settings.Secure.STYLUS_BUTTONS_ENABLED,

                 Settings.Secure.STYLUS_HANDWRITING_ENABLED,

                 Settings.Secure.TRUST_AGENTS_INITIALIZED,

                 Settings.Secure.KNOWN_TRUST_AGENTS_INITIALIZED,

                 Settings.Secure.TV_APP_USES_NON_SYSTEM_INPUTS,