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

Commit b74e6352 authored by Beverly's avatar Beverly Committed by android-build-merger
Browse files

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

am: cbc6bd83

Change-Id: Icbbcc62572671aab98a97fb7f28cd4a72a6875ba
parents 24048a5e cbc6bd83

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
@@ -213,8 +213,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 =
@@ -230,7 +228,6 @@ public class SoundSettings extends DashboardFragment { 


        controllers.add(dialPadTonePreferenceController);

        controllers.add(screenLockSoundPreferenceController);

        controllers.add(chargingSoundPreferenceController);

        controllers.add(dockingSoundPreferenceController);

        controllers.add(touchSoundPreferenceController);

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

                Arrays.asList(dialPadTonePreferenceController,

                        screenLockSoundPreferenceController,

                        chargingSoundPreferenceController,

                        dockingSoundPreferenceController,

                        touchSoundPreferenceController,

                        vibrateOnTouchPreferenceController,