summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreyosen <abittin@gmail.com>2015-01-10 16:19:39 +0200
committerSteve Kondik <shade@chemlab.org>2015-03-03 20:13:16 +0000
commit807e90d318fa225104bc6e4ed503d1b5e0d8c23d (patch)
treee2d4566233a4cf4a42bd5ffeed8f0d893bec0343
parente9561498cd571b8f5af753f444e58b30a7fc17f5 (diff)
downloadandroid_packages_apps_Dialer-807e90d318fa225104bc6e4ed503d1b5e0d8c23d.tar.gz
android_packages_apps_Dialer-807e90d318fa225104bc6e4ed503d1b5e0d8c23d.tar.bz2
android_packages_apps_Dialer-807e90d318fa225104bc6e4ed503d1b5e0d8c23d.zip
Dialer: switches for checkboxes
PS2: same topic items back to checkboxes Change-Id: I04741c89b327292197504ec47a4e7931a33a29b4 Signed-off-by: eyosen <abittin@gmail.com>
-rw-r--r--res/xml/general_settings.xml6
-rw-r--r--src/com/android/dialer/settings/GeneralSettingsFragment.java10
2 files changed, 8 insertions, 8 deletions
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml
index 9acde2338..5bd1216fd 100644
--- a/res/xml/general_settings.xml
+++ b/res/xml/general_settings.xml
@@ -47,13 +47,13 @@
android:persistent="false"
android:ringtoneType="ringtone" />
- <CheckBoxPreference
+ <SwitchPreference
android:key="button_play_dtmf_tone"
android:title="@string/dtmf_tone_enable_title"
android:persistent="false"
android:defaultValue="true" />
- <CheckBoxPreference
+ <SwitchPreference
android:key="button_vibrate_on_ring"
android:title="@string/vibrate_on_ring_title"
android:persistent="false"
@@ -98,7 +98,7 @@
android:title="@string/other_settings_title"
android:persistent="false" >
- <CheckBoxPreference
+ <SwitchPreference
android:key="detailed_incall_info"
android:title="@string/detailed_incall_info_title"
android:summary="@string/detailed_incall_info_summary" />
diff --git a/src/com/android/dialer/settings/GeneralSettingsFragment.java b/src/com/android/dialer/settings/GeneralSettingsFragment.java
index 46aa2007b..0745fc903 100644
--- a/src/com/android/dialer/settings/GeneralSettingsFragment.java
+++ b/src/com/android/dialer/settings/GeneralSettingsFragment.java
@@ -22,12 +22,12 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.os.Vibrator;
-import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceCategory;
import android.preference.PreferenceFragment;
import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
import android.provider.Settings;
import android.text.TextUtils;
@@ -60,8 +60,8 @@ public class GeneralSettingsFragment extends PreferenceFragment
private Context mContext;
private Preference mRingtonePreference;
- private CheckBoxPreference mVibrateWhenRinging;
- private CheckBoxPreference mPlayDtmfTone;
+ private SwitchPreference mVibrateWhenRinging;
+ private SwitchPreference mPlayDtmfTone;
private Preference mRespondViaSms;
private Preference mSpeedDialSettings;
private ListPreference mT9SearchInputLocale;
@@ -93,8 +93,8 @@ public class GeneralSettingsFragment extends PreferenceFragment
addPreferencesFromResource(R.xml.general_settings);
mRingtonePreference = findPreference(BUTTON_RINGTONE_KEY);
- mVibrateWhenRinging = (CheckBoxPreference) findPreference(BUTTON_VIBRATE_ON_RING);
- mPlayDtmfTone = (CheckBoxPreference) findPreference(BUTTON_PLAY_DTMF_TONE);
+ mVibrateWhenRinging = (SwitchPreference) findPreference(BUTTON_VIBRATE_ON_RING);
+ mPlayDtmfTone = (SwitchPreference) findPreference(BUTTON_PLAY_DTMF_TONE);
mRespondViaSms = findPreference(BUTTON_RESPOND_VIA_SMS_KEY);
mSpeedDialSettings = findPreference(BUTTON_SPEED_DIAL_KEY);
mT9SearchInputLocale = (ListPreference) findPreference(BUTTON_T9_SEARCH_INPUT_LOCALE);