OSDN Git Service

Settings: Remove sound settings.
authorJohn Spurlock <jspurlock@google.com>
Wed, 28 May 2014 13:43:45 +0000 (09:43 -0400)
committerJohn Spurlock <jspurlock@google.com>
Wed, 28 May 2014 20:37:43 +0000 (16:37 -0400)
commit4e4cdeffdb6087c953f44808f14f18554a749bda
treedb7f823fbe3a0fdbbfe3118a267ee9aaf277e8f9
parent9e8bd809fca7c5fccc02bb5671c78e60906bd12a
Settings: Remove sound settings.

- Move the remaining conditional preferences into
  the combined Sound & Notifications screen.
- Refactor the "Other sounds" sub-settings screen to
  provide a home for the new preferences.
- Migrate docking sounds, conditional on config.
- Migrate docking media, conditional on config.
- Migrate emergency tones, conditional on CDMA.
- Move all boilerplate preference <-> setting plumbing into
  a separate helper.
- Since some preferences in Other sounds are now conditional,
  create a special indexer for searching.
- Remove SoundSettings (and xml), create aliases in the manifest
  to avoid breaking shortcuts.

Bug:15279526
Change-Id: I5ae3ecda2f899b1948f7908bd217a799326c2c56
15 files changed:
AndroidManifest.xml
res/values/arrays.xml
res/values/strings.xml
res/xml/dashboard_categories.xml
res/xml/notification_settings.xml
res/xml/other_sound_settings.xml [moved from res/xml/touch_sound_settings.xml with 64% similarity]
res/xml/sound_settings.xml [deleted file]
src/com/android/settings/Settings.java
src/com/android/settings/SettingsActivity.java
src/com/android/settings/SoundSettings.java [deleted file]
src/com/android/settings/notification/NotificationSettings.java
src/com/android/settings/notification/OtherSoundSettings.java [new file with mode: 0644]
src/com/android/settings/notification/SettingPref.java [new file with mode: 0644]
src/com/android/settings/notification/TouchSoundSettings.java [deleted file]
src/com/android/settings/search/SearchIndexableResources.java