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

Merge "Only show BootSounds preference if has_boot_sounds is true." into nyc-mr1-dev

Browse Source
This commit is contained in:
Geoffrey Pitsch
2016-08-29 13:06:21 +00:00
committed by Android (Google) Code Review
parent 302abf2f54 fd351eaaf1
commit 1ff11c5ef0
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/bools.xml
View File

@@ -17,6 +17,8 @@
<resources> <resources>
<!-- Whether or not the dock settings are to be displayed for this device when docked --> <!-- Whether or not the dock settings are to be displayed for this device when docked -->
<bool name="has_dock_settings">false</bool> <bool name="has_dock_settings">false</bool>
<!-- Whether there is a boot sounds checkbox -->
<bool name="has_boot_sounds">false</bool>
<!-- Whether there is a silent mode checkbox --> <!-- Whether there is a silent mode checkbox -->
<bool name="has_silent_mode">true</bool> <bool name="has_silent_mode">true</bool>
<!-- Whether the DEPRECATED power control widget is enabled for this <!-- Whether the DEPRECATED power control widget is enabled for this

10
src/com/android/settings/notification/OtherSoundSettings.java
View File

@@ -209,8 +209,12 @@ public class OtherSoundSettings extends SettingsPreferenceFragment implements In
pref.init(this); pref.init(this);
} }
mBootSounds = (SwitchPreference) findPreference(KEY_BOOT_SOUNDS); if (mContext.getResources().getBoolean(R.bool.has_boot_sounds)) {
mBootSounds.setChecked(SystemProperties.getBoolean(PROPERTY_BOOT_SOUNDS, true)); mBootSounds = (SwitchPreference) findPreference(KEY_BOOT_SOUNDS);
mBootSounds.setChecked(SystemProperties.getBoolean(PROPERTY_BOOT_SOUNDS, true));
} else {
removePreference(KEY_BOOT_SOUNDS);
}
} }
@Override @Override
@@ -227,7 +231,7 @@ public class OtherSoundSettings extends SettingsPreferenceFragment implements In
@Override @Override
public boolean onPreferenceTreeClick(Preference preference) { public boolean onPreferenceTreeClick(Preference preference) {
if (preference == mBootSounds) { if (mBootSounds != null && preference == mBootSounds) {
SystemProperties.set(PROPERTY_BOOT_SOUNDS, mBootSounds.isChecked() ? "1" : "0"); SystemProperties.set(PROPERTY_BOOT_SOUNDS, mBootSounds.isChecked() ? "1" : "0");
return false; return false;
} else { } else {