PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 8e55299f98

Change-Id: I58e93b9c70d57224c01bd62fa47640badd1febaf
This commit is contained in:
android-build-team Robot
2018-04-30 14:22:42 -07:00
committed by android-build-merger
parent 022fcde73d 8e55299f98
commit 72cedc72a4
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/sound_settings.xml
View File

@@ -141,6 +141,11 @@
android:key="screen_locking_sounds" android:key="screen_locking_sounds"
android:title="@string/screen_locking_sounds_title" /> android:title="@string/screen_locking_sounds_title" />
<!-- Charging sounds -->
<SwitchPreference
android:key="charging_sounds"
android:title="@string/charging_sounds_title" />
<!-- Docking sounds --> <!-- Docking sounds -->
<SwitchPreference <SwitchPreference
android:key="docking_sounds" android:key="docking_sounds"

4
src/com/android/settings/notification/SoundSettings.java
View File

@@ -211,6 +211,8 @@ public class SoundSettings extends DashboardFragment {
new DialPadTonePreferenceController(context, fragment, lifecycle); new DialPadTonePreferenceController(context, fragment, lifecycle);
final ScreenLockSoundPreferenceController screenLockSoundPreferenceController = final ScreenLockSoundPreferenceController screenLockSoundPreferenceController =
new ScreenLockSoundPreferenceController(context, fragment, lifecycle); new ScreenLockSoundPreferenceController(context, fragment, lifecycle);
final ChargingSoundPreferenceController chargingSoundPreferenceController =
new ChargingSoundPreferenceController(context, fragment, lifecycle);
final DockingSoundPreferenceController dockingSoundPreferenceController = final DockingSoundPreferenceController dockingSoundPreferenceController =
new DockingSoundPreferenceController(context, fragment, lifecycle); new DockingSoundPreferenceController(context, fragment, lifecycle);
final TouchSoundPreferenceController touchSoundPreferenceController = final TouchSoundPreferenceController touchSoundPreferenceController =
@@ -226,6 +228,7 @@ public class SoundSettings extends DashboardFragment {
controllers.add(dialPadTonePreferenceController); controllers.add(dialPadTonePreferenceController);
controllers.add(screenLockSoundPreferenceController); controllers.add(screenLockSoundPreferenceController);
controllers.add(chargingSoundPreferenceController);
controllers.add(dockingSoundPreferenceController); controllers.add(dockingSoundPreferenceController);
controllers.add(touchSoundPreferenceController); controllers.add(touchSoundPreferenceController);
controllers.add(vibrateOnTouchPreferenceController); controllers.add(vibrateOnTouchPreferenceController);
@@ -236,6 +239,7 @@ public class SoundSettings extends DashboardFragment {
"other_sounds_and_vibrations_category").setChildren( "other_sounds_and_vibrations_category").setChildren(
Arrays.asList(dialPadTonePreferenceController, Arrays.asList(dialPadTonePreferenceController,
screenLockSoundPreferenceController, screenLockSoundPreferenceController,
chargingSoundPreferenceController,
dockingSoundPreferenceController, dockingSoundPreferenceController,
touchSoundPreferenceController, touchSoundPreferenceController,
vibrateOnTouchPreferenceController, vibrateOnTouchPreferenceController,