diff options
| author | Amith Yamasani <yamasani@google.com> | 2009-07-07 14:30:17 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2009-07-07 18:42:46 -0700 |
| commit | 8823c0a8c68fe669c21c539eef9fc6541f0c7494 (patch) | |
| tree | 4bacfa717e06b5cb002c296a66aca5cdd4951767 /core/java/android/provider/Settings.java | |
| parent | c4cf22e82ba8ec4eec7051ae3a8eb397ded578d1 (diff) | |
| download | frameworks_base-8823c0a8c68fe669c21c539eef9fc6541f0c7494.zip frameworks_base-8823c0a8c68fe669c21c539eef9fc6541f0c7494.tar.gz frameworks_base-8823c0a8c68fe669c21c539eef9fc6541f0c7494.tar.bz2 | |
Backup / Restore locale preference.
Also backup development settings MOCK_LOCATION and USB_DEBUGGING.
Backup and restore more of the Audio settings. Won't work yet without a reboot.
Disable Wifi supplicant restore temporarily. It seems to be disabling Wifi due to
permissions problems.
Don't restore Ringtones.
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, |