PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improved dialog management in Settings>Users" into jb-mr1-dev

Browse Source
This commit is contained in:
Amith Yamasani
2012-10-02 17:29:27 -07:00
committed by Android (Google) Code Review
parent d13e339685 c861cf8447
commit a8f3a204d9
3 changed files with 62 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/SoundSettings.java
View File

@@ -170,8 +170,11 @@ public class SoundSettings extends SettingsPreferenceFragment implements
Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
if (vibrator == null || !vibrator.hasVibrator()) {
getPreferenceScreen().removePreference(mVibrateWhenRinging);
getPreferenceScreen().removePreference(mHapticFeedback);
removePreference(KEY_VIBRATE);
removePreference(KEY_HAPTIC_FEEDBACK);
}
if (!Utils.isVoiceCapable(getActivity())) {
removePreference(KEY_VIBRATE);
}
if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) {