From 5d263ea4896f87d736b21fb567d25cb44c212d3e Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Wed, 16 May 2012 13:55:44 -0700 Subject: [PATCH] No more silent-mode tristate in Sound Settings. Delete delete delete. Bug: 6036529 Change-Id: Ia1ec2a1740c3010ec4373bed18ce72bedcb9211b --- res/values/arrays.xml | 14 ----- res/values/strings.xml | 2 - res/xml/sound_settings.xml | 6 -- src/com/android/settings/SoundSettings.java | 69 --------------------- 4 files changed, 91 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml index cf0eaa284c1..3367a57f205 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -548,20 +548,6 @@ auto - - - Off - Vibrate - Mute - - - - - off - vibrate - mute - - diff --git a/res/values/strings.xml b/res/values/strings.xml index 175797edea3..3dff4c87894 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1534,8 +1534,6 @@ Display Sound - - Silent mode Phone ringtone diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index a1252a1f258..6da9734cf40 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -26,12 +26,6 @@ android:persistent="false" android:streamType="ring" /> - - diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java index 7f11299a43d..67557b9d8f2 100644 --- a/src/com/android/settings/SoundSettings.java +++ b/src/com/android/settings/SoundSettings.java @@ -16,17 +16,14 @@ package com.android.settings; -import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.database.Cursor; import android.database.sqlite.SQLiteException; import android.media.AudioManager; -import android.media.Ringtone; import android.media.RingtoneManager; import android.media.audiofx.AudioEffect; import android.net.Uri; @@ -41,8 +38,6 @@ import android.preference.PreferenceGroup; import android.preference.PreferenceScreen; import android.provider.MediaStore; import android.provider.Settings; -import android.provider.MediaStore.Images.Media; -import android.provider.Settings.SettingNotFoundException; import android.telephony.TelephonyManager; import android.util.Log; @@ -55,7 +50,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements /** If there is no setting in the provider, use this. */ private static final int FALLBACK_EMERGENCY_TONE_VALUE = 0; - private static final String KEY_SILENT_MODE = "silent_mode"; private static final String KEY_VIBRATE = "vibrate_when_ringing"; private static final String KEY_RING_VOLUME = "ring_volume"; private static final String KEY_MUSICFX = "musicfx"; @@ -69,10 +63,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements private static final String KEY_NOTIFICATION_SOUND = "notification_sound"; private static final String KEY_CATEGORY_CALLS = "category_calls_and_notification"; - private static final String SILENT_MODE_OFF = "off"; - private static final String SILENT_MODE_VIBRATE = "vibrate"; - private static final String SILENT_MODE_MUTE = "mute"; - private static final String[] NEED_VOICE_CAPABILITY = { KEY_RINGTONE, KEY_DTMF_TONE, KEY_CATEGORY_CALLS, KEY_EMERGENCY_TONE @@ -82,7 +72,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements private static final int MSG_UPDATE_NOTIFICATION_SUMMARY = 2; private CheckBoxPreference mVibrateWhenRinging; - private ListPreference mSilentMode; private CheckBoxPreference mDtmfTone; private CheckBoxPreference mSoundEffects; private CheckBoxPreference mHapticFeedback; @@ -95,15 +84,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements private AudioManager mAudioManager; - private BroadcastReceiver mReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if (intent.getAction().equals(AudioManager.RINGER_MODE_CHANGED_ACTION)) { - updateState(false); - } - } - }; - private Handler mHandler = new Handler() { public void handleMessage(Message msg) { switch (msg.what) { @@ -134,12 +114,8 @@ public class SoundSettings extends SettingsPreferenceFragment implements getPreferenceScreen().removePreference(findPreference(KEY_EMERGENCY_TONE)); } - mSilentMode = (ListPreference) findPreference(KEY_SILENT_MODE); if (!getResources().getBoolean(R.bool.has_silent_mode)) { - getPreferenceScreen().removePreference(mSilentMode); findPreference(KEY_RING_VOLUME).setDependency(null); - } else { - mSilentMode.setOnPreferenceChangeListener(this); } mVibrateWhenRinging = (CheckBoxPreference) findPreference(KEY_VIBRATE); @@ -223,50 +199,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements public void onResume() { super.onResume(); - updateState(true); lookupRingtoneNames(); - - IntentFilter filter = new IntentFilter(AudioManager.RINGER_MODE_CHANGED_ACTION); - getActivity().registerReceiver(mReceiver, filter); - } - - @Override - public void onPause() { - super.onPause(); - - getActivity().unregisterReceiver(mReceiver); - } - - private void setPhoneSilentSettingValue(String value) { - int ringerMode = AudioManager.RINGER_MODE_NORMAL; - if (value.equals(SILENT_MODE_MUTE)) { - ringerMode = AudioManager.RINGER_MODE_SILENT; - } else if (value.equals(SILENT_MODE_VIBRATE)) { - ringerMode = AudioManager.RINGER_MODE_VIBRATE; - } - mAudioManager.setRingerMode(ringerMode); - } - - private String getPhoneSilentModeSettingValue() { - switch (mAudioManager.getRingerMode()) { - case AudioManager.RINGER_MODE_NORMAL: - return SILENT_MODE_OFF; - case AudioManager.RINGER_MODE_VIBRATE: - return SILENT_MODE_VIBRATE; - case AudioManager.RINGER_MODE_SILENT: - return SILENT_MODE_MUTE; - } - // Shouldn't happen - return SILENT_MODE_OFF; - } - - // updateState in fact updates the UI to reflect the system state - private void updateState(boolean force) { - if (getActivity() == null) return; - - mSilentMode.setValue(getPhoneSilentModeSettingValue()); - - mSilentMode.setSummary(mSilentMode.getEntry()); } private void updateRingtoneName(int type, Preference preference, int msg) { @@ -344,8 +277,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements } catch (NumberFormatException e) { Log.e(TAG, "could not persist emergency tone setting", e); } - } else if (preference == mSilentMode) { - setPhoneSilentSettingValue(objValue.toString()); } return true;