Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72cedc72 authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

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

am: 8e55299f

Change-Id: I58e93b9c70d57224c01bd62fa47640badd1febaf
parents 022fcde7 8e55299f

res/xml/sound_settings.xml

+5 −0
Original line number Diff line number Diff line
@@ -141,6 +141,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"

src/com/android/settings/notification/SoundSettings.java

+4 −0
Original line number Diff line number Diff line
@@ -211,6 +211,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 =
@@ -226,6 +228,7 @@ public class SoundSettings extends DashboardFragment { 


        controllers.add(dialPadTonePreferenceController);

        controllers.add(screenLockSoundPreferenceController);

        controllers.add(chargingSoundPreferenceController);

        controllers.add(dockingSoundPreferenceController);

        controllers.add(touchSoundPreferenceController);

        controllers.add(vibrateOnTouchPreferenceController);
@@ -236,6 +239,7 @@ public class SoundSettings extends DashboardFragment { 
                "other_sounds_and_vibrations_category").setChildren(

                Arrays.asList(dialPadTonePreferenceController,

                        screenLockSoundPreferenceController,

                        chargingSoundPreferenceController,

                        dockingSoundPreferenceController,

                        touchSoundPreferenceController,

                        vibrateOnTouchPreferenceController,