diff options
| author | Chris Tate <ctate@android.com> | 2010-02-25 17:20:50 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-25 17:20:50 -0800 |
| commit | 3f3e53bc30dbf0e47c90be5cf4bd4faabda9c601 (patch) | |
| tree | e9b62f1301c4d3214d77078fc620d8fcd97e0362 /core | |
| parent | ae06ed97382429f51075d257e3290cdd86f66326 (diff) | |
| parent | 14c2d79028224118b96a03d2db6bab1902ccb6af (diff) | |
| download | frameworks_base-3f3e53bc30dbf0e47c90be5cf4bd4faabda9c601.zip frameworks_base-3f3e53bc30dbf0e47c90be5cf4bd4faabda9c601.tar.gz frameworks_base-3f3e53bc30dbf0e47c90be5cf4bd4faabda9c601.tar.bz2 | |
Merge "Be sure to back up / restore some new settings"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index b75a8cc..081cf32 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1647,6 +1647,9 @@ public final class Settings { TTY_MODE, SOUND_EFFECTS_ENABLED, HAPTIC_FEEDBACK_ENABLED, + POWER_SOUNDS_ENABLED, + DOCK_SOUNDS_ENABLED, + LOCKSCREEN_SOUNDS_ENABLED, SHOW_WEB_SUGGESTIONS, NOTIFICATION_LIGHT_PULSE }; @@ -3095,6 +3098,7 @@ public final class Settings { PARENTAL_CONTROL_REDIRECT_URL, USB_MASS_STORAGE_ENABLED, ACCESSIBILITY_ENABLED, + BACKUP_AUTO_RESTORE, ENABLED_ACCESSIBILITY_SERVICES, TTS_USE_DEFAULTS, TTS_DEFAULT_RATE, |