diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-09-20 14:41:03 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2011-09-20 14:41:03 -0700 |
| commit | 883d850ede03968018587781a8e20683398d98fe (patch) | |
| tree | c1a0835e18b80670faabb06a0faf85ea14155291 /src/com/android/settings/SoundSettings.java | |
| parent | 69dfd42520ccea4556a860b483e264a229293fa2 (diff) | |
| download | packages_apps_Settings-883d850ede03968018587781a8e20683398d98fe.zip packages_apps_Settings-883d850ede03968018587781a8e20683398d98fe.tar.gz packages_apps_Settings-883d850ede03968018587781a8e20683398d98fe.tar.bz2 | |
Move "Pulse notification light" to Display settings.
Bug: 5242350
Change-Id: I91cb23ca8f49c1c053710031b0316b10d55fbab4
Diffstat (limited to 'src/com/android/settings/SoundSettings.java')
| -rw-r--r-- | src/com/android/settings/SoundSettings.java | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java index c200c63..8b7cd37 100644 --- a/src/com/android/settings/SoundSettings.java +++ b/src/com/android/settings/SoundSettings.java @@ -64,7 +64,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements private static final String KEY_HAPTIC_FEEDBACK = "haptic_feedback"; private static final String KEY_EMERGENCY_TONE = "emergency_tone"; private static final String KEY_SOUND_SETTINGS = "sound_settings"; - private static final String KEY_NOTIFICATION_PULSE = "notification_pulse"; private static final String KEY_LOCK_SOUNDS = "lock_sounds"; private static final String KEY_RINGTONE = "ringtone"; private static final String KEY_NOTIFICATION_SOUND = "notification_sound"; @@ -96,7 +95,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements private CheckBoxPreference mDtmfTone; private CheckBoxPreference mSoundEffects; private CheckBoxPreference mHapticFeedback; - private CheckBoxPreference mNotificationPulse; private Preference mMusicFx; private CheckBoxPreference mLockSounds; private Preference mRingtonePreference; @@ -188,21 +186,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements } mSoundSettings = (PreferenceGroup) findPreference(KEY_SOUND_SETTINGS); - mNotificationPulse = (CheckBoxPreference) - mSoundSettings.findPreference(KEY_NOTIFICATION_PULSE); - if (mNotificationPulse != null - && getResources().getBoolean( - com.android.internal.R.bool.config_intrusiveNotificationLed) == false) { - mSoundSettings.removePreference(mNotificationPulse); - } else { - try { - mNotificationPulse.setChecked(Settings.System.getInt(resolver, - Settings.System.NOTIFICATION_LIGHT_PULSE) == 1); - mNotificationPulse.setOnPreferenceChangeListener(this); - } catch (SettingNotFoundException snfe) { - Log.e(TAG, Settings.System.NOTIFICATION_LIGHT_PULSE + " not found"); - } - } mMusicFx = mSoundSettings.findPreference(KEY_MUSICFX); Intent i = new Intent(AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL); @@ -418,10 +401,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements Settings.System.putInt(getContentResolver(), Settings.System.LOCKSCREEN_SOUNDS_ENABLED, mLockSounds.isChecked() ? 1 : 0); - } else if (preference == mNotificationPulse) { - boolean value = mNotificationPulse.isChecked(); - Settings.System.putInt(getContentResolver(), - Settings.System.NOTIFICATION_LIGHT_PULSE, value ? 1 : 0); } else if (preference == mMusicFx) { // let the framework fire off the intent return false; |