Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8749f35f authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 506b68e1: Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY" 

* commit '506b68e1':
  Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY
parents 565af383 506b68e1

src/com/android/settings/SoundSettings.java

+1 −4
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements 


    private static final String[] NEED_VOICE_CAPABILITY = {

            KEY_RINGTONE, KEY_DTMF_TONE, KEY_CATEGORY_CALLS,

            KEY_EMERGENCY_TONE

            KEY_EMERGENCY_TONE, KEY_VIBRATE

    };



    private static final int MSG_UPDATE_RINGTONE_SUMMARY = 1;
@@ -175,9 +175,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements 
            removePreference(KEY_VIBRATE);

            removePreference(KEY_HAPTIC_FEEDBACK);

        }

        if (!Utils.isVoiceCapable(getActivity())) {

            removePreference(KEY_VIBRATE);

        }



        if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) {

            ListPreference emergencyTonePreference =