commit edac9af662f01026fd2b4acf263e1b5d1dfdeaa9
author Amith Yamasani <yamasani@google.com> Wed Nov 17 09:08:21 2010 -0800
committer Amith Yamasani <yamasani@google.com> Wed Nov 17 09:08:21 2010 -0800
tree 4ef9cf25c10c6bb35ebd99a1040cc801fb62cc25
parent 8ba83bf5ff70dca2c31c644c3fde7c9f5d7d92ea

Conditional remove "haptic" settings if there's no vibrator

Bug: 3193801

src/com/android/settings/SoundSettings.java

diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 686dbe2..4c5fadf 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -114,10 +114,6 @@
         mVibrate = (ListPreference) findPreference(KEY_VIBRATE);
         mVibrate.setOnPreferenceChangeListener(this);
 
-        if (!((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) {
-            getPreferenceScreen().removePreference(mVibrate);
-        }
-        
         mDtmfTone = (CheckBoxPreference) findPreference(KEY_DTMF_TONE);
         mDtmfTone.setPersistent(false);
         mDtmfTone.setChecked(Settings.System.getInt(resolver,
@@ -135,6 +131,11 @@
         mLockSounds.setChecked(Settings.System.getInt(resolver,
                 Settings.System.LOCKSCREEN_SOUNDS_ENABLED, 1) != 0);
 
+        if (!((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) {
+            getPreferenceScreen().removePreference(mVibrate);
+            getPreferenceScreen().removePreference(mHapticFeedback);
+        }
+
         if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) {
             ListPreference emergencyTonePreference =
                 (ListPreference) findPreference(KEY_EMERGENCY_TONE);