summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2014-11-23 15:15:05 +0100
committerGerrit Code Review <gerrit@cyanogenmod.org>2014-11-25 12:01:08 +0000
commit10d24bfeb1504e251e86ecb4ec5216699549cf7b (patch)
tree0e6e2d058f4c476e37789ff8ed02965e7bbc2402 /src
parentb731b8e33b8b8e0a7d85281c4ebd9ebc95a97d44 (diff)
downloadandroid_packages_apps_Dialer-10d24bfeb1504e251e86ecb4ec5216699549cf7b.tar.gz
android_packages_apps_Dialer-10d24bfeb1504e251e86ecb4ec5216699549cf7b.tar.bz2
android_packages_apps_Dialer-10d24bfeb1504e251e86ecb4ec5216699549cf7b.zip
Add back in-call vibration features (2/2)
Add settings implementation. Change-Id: I48d56f28cf1caf8ab783f693887b282d5a2d4a2b
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/settings/GeneralSettingsFragment.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/dialer/settings/GeneralSettingsFragment.java b/src/com/android/dialer/settings/GeneralSettingsFragment.java
index 30a7b6317..a5763a85f 100644
--- a/src/com/android/dialer/settings/GeneralSettingsFragment.java
+++ b/src/com/android/dialer/settings/GeneralSettingsFragment.java
@@ -43,6 +43,8 @@ import java.lang.Thread;
public class GeneralSettingsFragment extends PreferenceFragment
implements Preference.OnPreferenceChangeListener {
private static final String CATEGORY_SOUNDS_KEY = "dialer_general_sounds_category_key";
+ private static final String CATEGORY_INCALL_VIBRATION_KEY =
+ "dialer_general_incall_vibration_category_key";
private static final String BUTTON_RINGTONE_KEY = "button_ringtone_key";
private static final String BUTTON_VIBRATE_ON_RING = "button_vibrate_on_ring";
private static final String BUTTON_PLAY_DTMF_TONE = "button_play_dtmf_tone";
@@ -86,15 +88,20 @@ public class GeneralSettingsFragment extends PreferenceFragment
mSpeedDialSettings = findPreference(BUTTON_SPEED_DIAL_KEY);
PreferenceCategory soundCategory = (PreferenceCategory) findPreference(CATEGORY_SOUNDS_KEY);
+ Vibrator vibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
+ boolean hasVibrator = vibrator != null && vibrator.hasVibrator();
+
if (mVibrateWhenRinging != null) {
- Vibrator vibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
- if (vibrator != null && vibrator.hasVibrator()) {
+ if (hasVibrator) {
mVibrateWhenRinging.setOnPreferenceChangeListener(this);
} else {
soundCategory.removePreference(mVibrateWhenRinging);
mVibrateWhenRinging = null;
}
}
+ if (!hasVibrator) {
+ getPreferenceScreen().removePreference(findPreference(CATEGORY_INCALL_VIBRATION_KEY));
+ }
if (mPlayDtmfTone != null) {
mPlayDtmfTone.setOnPreferenceChangeListener(this);