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

Commit adec029f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 1ee83ac4 fbe721b1

res/xml/sound_settings.xml

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

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

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


        controllers.add(dialPadTonePreferenceController);

        controllers.add(screenLockSoundPreferenceController);

        controllers.add(chargingSoundPreferenceController);

        controllers.add(dockingSoundPreferenceController);

        controllers.add(touchSoundPreferenceController);

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

                Arrays.asList(dialPadTonePreferenceController,

                        screenLockSoundPreferenceController,

                        chargingSoundPreferenceController,

                        dockingSoundPreferenceController,

                        touchSoundPreferenceController,

                        vibrateOnTouchPreferenceController,