commit 4e4cdeffdb6087c953f44808f14f18554a749bda
author John Spurlock <jspurlock@google.com> Wed May 28 09:43:45 2014 -0400
committer John Spurlock <jspurlock@google.com> Wed May 28 16:37:43 2014 -0400
tree db7f823fbe3a0fdbbfe3118a267ee9aaf277e8f9
parent 9e8bd809fca7c5fccc02bb5671c78e60906bd12a

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

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index a4aa60f..18bab2c 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -200,7 +200,7 @@
             R.id.data_usage_settings,
             R.id.wireless_settings,
             R.id.device_section,
-            R.id.sound_settings,
+            R.id.notification_settings,
             R.id.display_settings,
             R.id.storage_settings,
             R.id.application_settings,
@@ -236,7 +236,6 @@
             SpellCheckersSettings.class.getName(),
             UserDictionaryList.class.getName(),
             UserDictionarySettings.class.getName(),
-            SoundSettings.class.getName(),
             DisplaySettings.class.getName(),
             DeviceInfoSettings.class.getName(),
             ManageApplications.class.getName(),