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

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

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