diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-07 18:59:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-07 18:59:28 -0700 |
| commit | d6fe243c1c6d5e994cacede8110eef736767bd7f (patch) | |
| tree | 1ea1e79ce0d7a59c16c6e685f586bf79909b0d02 /core/java/android/provider/Settings.java | |
| parent | a83bef597430e9336566ca38330cc0f4e793abe1 (diff) | |
| parent | 8823c0a8c68fe669c21c539eef9fc6541f0c7494 (diff) | |
| download | frameworks_base-d6fe243c1c6d5e994cacede8110eef736767bd7f.zip frameworks_base-d6fe243c1c6d5e994cacede8110eef736767bd7f.tar.gz frameworks_base-d6fe243c1c6d5e994cacede8110eef736767bd7f.tar.bz2 | |
Merge change 6437 into donut
* changes:
Backup / Restore locale preference.
Diffstat (limited to 'core/java/android/provider/Settings.java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 0d27e1e..aa583ac 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1359,8 +1359,21 @@ public final class Settings { SCREEN_BRIGHTNESS, VIBRATE_ON, NOTIFICATIONS_USE_RING_VOLUME, - RINGTONE, - NOTIFICATION_SOUND, + MODE_RINGER, + MODE_RINGER_STREAMS_AFFECTED, + MUTE_STREAMS_AFFECTED, + VOLUME_VOICE, + VOLUME_SYSTEM, + VOLUME_RING, + VOLUME_MUSIC, + VOLUME_ALARM, + VOLUME_NOTIFICATION, + VOLUME_VOICE + APPEND_FOR_LAST_AUDIBLE, + VOLUME_SYSTEM + APPEND_FOR_LAST_AUDIBLE, + VOLUME_RING + APPEND_FOR_LAST_AUDIBLE, + VOLUME_MUSIC + APPEND_FOR_LAST_AUDIBLE, + VOLUME_ALARM + APPEND_FOR_LAST_AUDIBLE, + VOLUME_NOTIFICATION + APPEND_FOR_LAST_AUDIBLE, TEXT_AUTO_REPLACE, TEXT_AUTO_CAPS, TEXT_AUTO_PUNCTUATE, @@ -2299,6 +2312,8 @@ public final class Settings { * @hide */ public static final String[] SETTINGS_TO_BACKUP = { + ADB_ENABLED, + ALLOW_MOCK_LOCATION, INSTALL_NON_MARKET_APPS, PARENTAL_CONTROL_ENABLED, PARENTAL_CONTROL_REDIRECT_URL, |