Merge "Get rid of charging sounds toggle" into pi-dev

diff --combined res/xml/sound_settings.xml
index 7ba1c76,6e469b6..704d553
--- 1/res/xml/sound_settings.xml
--- 2/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@@ -30,14 -30,6 +30,14 @@@
          android:order="-180"
          settings:controller="com.android.settings.notification.MediaVolumePreferenceController"/>
  
 +    <!-- Media output switcher -->
 +    <ListPreference
 +        android:key="media_output"
 +        android:title="@string/media_output_title"
 +        android:dialogTitle="@string/media_output_title"
 +        android:order="-175"
 +        settings:controller="com.android.settings.sound.MediaOutputPreferenceController"/>
 +
      <!-- Ring volume -->
      <com.android.settings.notification.VolumeSeekBarPreference
          android:key="ring_volume"
@@@ -53,14 -45,6 +53,14 @@@
          android:title="@string/vibrate_when_ringing_title"
          android:order="-160"/>
  
 +    <!-- Hands free profile output switcher -->
 +    <ListPreference
 +        android:key="take_call_on_output"
 +        android:title="@string/take_call_on_title"
 +        android:dialogTitle="@string/take_call_on_title"
 +        android:order="-155"
 +        settings:controller="com.android.settings.sound.HandsFreeProfileOutputPreferenceController"/>
 +
      <!-- Alarm volume -->
      <com.android.settings.notification.VolumeSeekBarPreference
          android:key="alarm_volume"
@@@ -141,11 -125,6 +141,6 @@@
            android:key="screen_locking_sounds"
            android:title="@string/screen_locking_sounds_title" />
  
-         <!-- Charging sounds -->
-         <SwitchPreference
-           android:key="charging_sounds"
-           android:title="@string/charging_sounds_title" />
- 
          <!-- Docking sounds -->
          <SwitchPreference
            android:key="docking_sounds"

diff --combined src/com/android/settings/notification/SoundSettings.java
index dbf8ecf,e1aad67..6535812
--- 1/src/com/android/settings/notification/SoundSettings.java
--- 2/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@@ -146,16 -146,10 +146,16 @@@ public class SoundSettings extends Dash
      @Override
      public void onAttach(Context context) {
          super.onAttach(context);
 -        use(AlarmVolumePreferenceController.class).setCallback(mVolumeCallback);
 -        use(MediaVolumePreferenceController.class).setCallback(mVolumeCallback);
 -        use(RingVolumePreferenceController.class).setCallback(mVolumeCallback);
 -        use(NotificationVolumePreferenceController.class).setCallback(mVolumeCallback);
 +        ArrayList<VolumeSeekBarPreferenceController> volumeControllers = new ArrayList<>();
 +        volumeControllers.add(use(AlarmVolumePreferenceController.class));
 +        volumeControllers.add(use(MediaVolumePreferenceController.class));
 +        volumeControllers.add(use(RingVolumePreferenceController.class));
 +        volumeControllers.add(use(NotificationVolumePreferenceController.class));
 +
 +        for (VolumeSeekBarPreferenceController controller : volumeControllers) {
 +            controller.setCallback(mVolumeCallback);
 +            getLifecycle().addObserver(controller);
 +        }
      }
  
      // === Volumes ===
@@@ -211,8 -205,6 +211,6 @@@
                  new DialPadTonePreferenceController(context, fragment, lifecycle);
          final ScreenLockSoundPreferenceController screenLockSoundPreferenceController =
                  new ScreenLockSoundPreferenceController(context, fragment, lifecycle);
-         final ChargingSoundPreferenceController chargingSoundPreferenceController =
-                 new ChargingSoundPreferenceController(context, fragment, lifecycle);
          final DockingSoundPreferenceController dockingSoundPreferenceController =
                  new DockingSoundPreferenceController(context, fragment, lifecycle);
          final TouchSoundPreferenceController touchSoundPreferenceController =
@@@ -228,7 -220,6 +226,6 @@@
  
          controllers.add(dialPadTonePreferenceController);
          controllers.add(screenLockSoundPreferenceController);
-         controllers.add(chargingSoundPreferenceController);
          controllers.add(dockingSoundPreferenceController);
          controllers.add(touchSoundPreferenceController);
          controllers.add(vibrateOnTouchPreferenceController);
@@@ -239,7 -230,6 +236,6 @@@
                  "other_sounds_and_vibrations_category").setChildren(
                  Arrays.asList(dialPadTonePreferenceController,
                          screenLockSoundPreferenceController,
-                         chargingSoundPreferenceController,
                          dockingSoundPreferenceController,
                          touchSoundPreferenceController,
                          vibrateOnTouchPreferenceController,