diff options
| author | Andy Hung <hunga@google.com> | 2016-01-08 23:17:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-01-08 23:17:56 +0000 |
| commit | 867b3396605421708dbcb0595b8954a3f96858ed (patch) | |
| tree | e676d8b6ce664ea3a65985e4d4c1a5db5e7f6bc7 /core/java/android | |
| parent | 0ab0bdde2b39c77175d9e0d69d6631e130e4b5ac (diff) | |
| parent | f04b84d4c66ea377ec6fe2b36f3a0994f3e94eba (diff) | |
Merge "Add setMasterMono and getMasterMono"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 1908aea5f865..a0066741e11d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2606,6 +2606,15 @@ public final class Settings { private static final Validator MICROPHONE_MUTE_VALIDATOR = sBooleanValidator; /** + * Master mono (int 1 = mono, 0 = normal). + * + * @hide + */ + public static final String MASTER_MONO = "master_mono"; + + private static final Validator MASTER_MONO_VALIDATOR = sBooleanValidator; + + /** * Whether the notifications should use the ring volume (value of 1) or * a separate notification volume (value of 0). In most cases, users * will have this enabled so the notification and ringer volumes will be @@ -3372,6 +3381,7 @@ public final class Settings { PRIVATE_SETTINGS.add(VOLUME_MASTER); PRIVATE_SETTINGS.add(VOLUME_MASTER_MUTE); PRIVATE_SETTINGS.add(MICROPHONE_MUTE); + PRIVATE_SETTINGS.add(MASTER_MONO); PRIVATE_SETTINGS.add(NOTIFICATIONS_USE_RING_VOLUME); PRIVATE_SETTINGS.add(VIBRATE_IN_SILENT); PRIVATE_SETTINGS.add(MEDIA_BUTTON_RECEIVER); @@ -3450,6 +3460,7 @@ public final class Settings { VALIDATORS.put(VIBRATE_INPUT_DEVICES, VIBRATE_INPUT_DEVICES_VALIDATOR); VALIDATORS.put(VOLUME_MASTER_MUTE, VOLUME_MASTER_MUTE_VALIDATOR); VALIDATORS.put(MICROPHONE_MUTE, MICROPHONE_MUTE_VALIDATOR); + VALIDATORS.put(MASTER_MONO, MASTER_MONO_VALIDATOR); VALIDATORS.put(NOTIFICATIONS_USE_RING_VOLUME, NOTIFICATIONS_USE_RING_VOLUME_VALIDATOR); VALIDATORS.put(VIBRATE_IN_SILENT, VIBRATE_IN_SILENT_VALIDATOR); VALIDATORS.put(MEDIA_BUTTON_RECEIVER, MEDIA_BUTTON_RECEIVER_VALIDATOR); |