diff options
| author | Hall Liu <hallliu@google.com> | 2018-04-05 18:15:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-05 18:15:37 +0000 |
| commit | fe85e4589bc17e899f471dde1b6573f4673a31b9 (patch) | |
| tree | 597f160d2ea1e1675ab7e2d489fe076b76815f1a /core/java/android/provider/Settings.java | |
| parent | 164a73e0cfa880f26acdc04e0c35255cf8cd671d (diff) | |
| parent | 44e41012ecaad1c8e5d78e0efb3b6d9d997a4108 (diff) | |
Merge "Move RTT system setting to Settings.Secure" into pi-dev
Diffstat (limited to 'core/java/android/provider/Settings.java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 98d8666ecd47..a99ae2e4b58b 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3753,17 +3753,6 @@ public final class Settings { new SettingsValidators.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 = BOOLEAN_VALIDATOR; - - /** * Whether the sounds effects (key clicks, lid open ...) are enabled. The value is * boolean (1 or 0). */ @@ -4088,7 +4077,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, @@ -4287,7 +4275,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); @@ -6660,6 +6647,17 @@ public final class Settings { private static final Validator TTY_MODE_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR; /** + * 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"; + + private static final Validator RTT_CALLING_MODE_VALIDATOR = BOOLEAN_VALIDATOR; + + /** + /** * Controls whether settings backup is enabled. * Type: int ( 0 = disabled, 1 = enabled ) * @hide @@ -7885,6 +7883,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, @@ -8014,6 +8013,7 @@ public final class Settings { VALIDATORS.put(ENHANCED_VOICE_PRIVACY_ENABLED, ENHANCED_VOICE_PRIVACY_ENABLED_VALIDATOR); VALIDATORS.put(TTY_MODE_ENABLED, TTY_MODE_ENABLED_VALIDATOR); + VALIDATORS.put(RTT_CALLING_MODE, RTT_CALLING_MODE_VALIDATOR); VALIDATORS.put(INCALL_POWER_BUTTON_BEHAVIOR, INCALL_POWER_BUTTON_BEHAVIOR_VALIDATOR); VALIDATORS.put(NIGHT_DISPLAY_CUSTOM_START_TIME, NIGHT_DISPLAY_CUSTOM_START_TIME_VALIDATOR); |