From 6761acdd332794176e7b962a6ad13b2cbc7c833b Mon Sep 17 00:00:00 2001
From: Beverly Tai <beverlyt@google.com>
Date: Mon, 30 Apr 2018 20:01:40 +0000
Subject: [PATCH] Revert "Get rid of charging sounds toggle"

Bug: 77912907
This reverts commit fbe721b1b39d48ef8665267774b54f5f04b20d58.

Reason for revert: negative dogfood feedback

Change-Id: I8485a379eafee0a4fcd599e9b1c47aee7dd3c6ad
---
 res/xml/sound_settings.xml                               | 5 +++++
 src/com/android/settings/notification/SoundSettings.java | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 6e469b6a457..735b3b7d986 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -125,6 +125,11 @@
           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 --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index e1aad67dc56..4c9ee38afa2 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -205,6 +205,8 @@ public class SoundSettings extends DashboardFragment {
                 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 =
@@ -220,6 +222,7 @@ public class SoundSettings extends DashboardFragment {
 
         controllers.add(dialPadTonePreferenceController);
         controllers.add(screenLockSoundPreferenceController);
+        controllers.add(chargingSoundPreferenceController);
         controllers.add(dockingSoundPreferenceController);
         controllers.add(touchSoundPreferenceController);
         controllers.add(vibrateOnTouchPreferenceController);
@@ -230,6 +233,7 @@ public class SoundSettings extends DashboardFragment {
                 "other_sounds_and_vibrations_category").setChildren(
                 Arrays.asList(dialPadTonePreferenceController,
                         screenLockSoundPreferenceController,
+                        chargingSoundPreferenceController,
                         dockingSoundPreferenceController,
                         touchSoundPreferenceController,
                         vibrateOnTouchPreferenceController,