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

Commit 9a51f071 authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Move RTT system setting to Settings.Secure"

parents 087bae3f 60fd195a

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -35306,6 +35306,7 @@ package android.provider { 
    field public static final java.lang.String PARENTAL_CONTROL_ENABLED = "parental_control_enabled";

    field public static final java.lang.String PARENTAL_CONTROL_LAST_UPDATE = "parental_control_last_update";

    field public static final java.lang.String PARENTAL_CONTROL_REDIRECT_URL = "parental_control_redirect_url";

    field public static final java.lang.String RTT_CALLING_MODE = "rtt_calling_mode";

    field public static final java.lang.String SELECTED_INPUT_METHOD_SUBTYPE = "selected_input_method_subtype";

    field public static final java.lang.String SETTINGS_CLASSNAME = "settings_classname";

    field public static final java.lang.String SKIP_FIRST_USE_HINTS = "skip_first_use_hints";
@@ -35411,7 +35412,6 @@ package android.provider { 
    field public static final deprecated java.lang.String RADIO_NFC = "nfc";

    field public static final deprecated java.lang.String RADIO_WIFI = "wifi";

    field public static final java.lang.String RINGTONE = "ringtone";

    field public static final java.lang.String RTT_CALLING_MODE = "rtt_calling_mode";

    field public static final java.lang.String SCREEN_BRIGHTNESS = "screen_brightness";

    field public static final java.lang.String SCREEN_BRIGHTNESS_MODE = "screen_brightness_mode";

    field public static final int SCREEN_BRIGHTNESS_MODE_AUTOMATIC = 1; // 0x1

core/java/android/provider/Settings.java

+10 −13
Original line number Diff line number Diff line
@@ -3672,17 +3672,6 @@ public final class Settings { 
        /** @hide */

        public static final Validator TTY_MODE_VALIDATOR = new InclusiveIntegerRangeValidator(0, 3);



        /**

         * User-selected RTT mode. When on, outgoing and incoming calls will be answered as RTT

         * calls when supported by the device and carrier. Boolean value.

         * 0 = OFF

         * 1 = ON

         */

        public static final String RTT_CALLING_MODE = "rtt_calling_mode";



        /** @hide */

        public static final Validator RTT_CALLING_MODE_VALIDATOR = sBooleanValidator;



        /**

         * Whether the sounds effects (key clicks, lid open ...) are enabled. The value is

         * boolean (1 or 0).
@@ -4003,7 +3992,6 @@ public final class Settings { 
            DTMF_TONE_WHEN_DIALING,

            DTMF_TONE_TYPE_WHEN_DIALING,

            HEARING_AID,

            RTT_CALLING_MODE,

            TTY_MODE,

            MASTER_MONO,

            SOUND_EFFECTS_ENABLED,
@@ -4187,7 +4175,6 @@ public final class Settings { 
            VALIDATORS.put(DTMF_TONE_TYPE_WHEN_DIALING, DTMF_TONE_TYPE_WHEN_DIALING_VALIDATOR);

            VALIDATORS.put(HEARING_AID, HEARING_AID_VALIDATOR);

            VALIDATORS.put(TTY_MODE, TTY_MODE_VALIDATOR);

            VALIDATORS.put(RTT_CALLING_MODE, RTT_CALLING_MODE_VALIDATOR);

            VALIDATORS.put(NOTIFICATION_LIGHT_PULSE, NOTIFICATION_LIGHT_PULSE_VALIDATOR);

            VALIDATORS.put(POINTER_LOCATION, POINTER_LOCATION_VALIDATOR);

            VALIDATORS.put(SHOW_TOUCHES, SHOW_TOUCHES_VALIDATOR);
@@ -6261,6 +6248,15 @@ public final class Settings { 
         */

        public static final String TTY_MODE_ENABLED = "tty_mode_enabled";



        /**

         * User-selected RTT mode. When on, outgoing and incoming calls will be answered as RTT

         * calls when supported by the device and carrier. Boolean value.

         * 0 = OFF

         * 1 = ON

         */

        public static final String RTT_CALLING_MODE = "rtt_calling_mode";



        /**

        /**

         * Controls whether settings backup is enabled.

         * Type: int ( 0 = disabled, 1 = enabled )
@@ -7218,6 +7214,7 @@ public final class Settings { 
            PREFERRED_TTY_MODE,

            ENHANCED_VOICE_PRIVACY_ENABLED,

            TTY_MODE_ENABLED,

            RTT_CALLING_MODE,

            INCALL_POWER_BUTTON_BEHAVIOR,

            NIGHT_DISPLAY_CUSTOM_START_TIME,

            NIGHT_DISPLAY_CUSTOM_END_TIME,