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

Commit 235c1623 authored by John Li's avatar John Li Committed by Android (Google) Code Review
Browse files

Merge "Add @SystemApi for Secure.UI_TRANSLATION_ENABLED" into sc-dev

parents 2a3eef7a 221de345
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -9301,6 +9301,7 @@ package android.provider {
    field public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications";
    field public static final String ODI_CAPTIONS_ENABLED = "odi_captions_enabled";
    field public static final String THEME_CUSTOMIZATION_OVERLAY_PACKAGES = "theme_customization_overlay_packages";
    field public static final String UI_TRANSLATION_ENABLED = "ui_translation_enabled";
    field public static final String USER_SETUP_COMPLETE = "user_setup_complete";
    field public static final int USER_SETUP_PERSONALIZATION_COMPLETE = 10; // 0xa
    field public static final int USER_SETUP_PERSONALIZATION_NOT_STARTED = 0; // 0x0
+5 −2
Original line number Diff line number Diff line
@@ -8539,13 +8539,16 @@ public final class Settings {
                "one_handed_tutorial_show_count";
        /**
         * Indicates whether transform is enabled.
         * Indicates whether ui translation is enabled.
         * <p>
         * Type: int (0 for false, 1 for true)
         *
         * @hide
         */
        public static final String TRANSFORM_ENABLED = "transform_enabled";
        @SystemApi
        @Readable
        @SuppressLint("NoSettingsProvider")
        public static final String UI_TRANSLATION_ENABLED = "ui_translation_enabled";
        /**
         * The current night mode that has been selected by the user.  Owned
+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ public class SettingsBackupTest {
                 Settings.Secure.SUPPRESS_DOZE,
                 Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED,
                 Settings.Secure.ACCESSIBILITY_SHOW_WINDOW_MAGNIFICATION_PROMPT,
                 Settings.Secure.TRANSFORM_ENABLED);
                 Settings.Secure.UI_TRANSLATION_ENABLED);

    @Test
    public void systemSettingsBackedUpOrDenied() {