diff options
author | Roshan Pius <rpius@google.com> | 2015-07-14 16:41:59 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 16:41:59 +0000 |
commit | 12d8a88783bc32cde438ccd4ce96dacfa26c3132 (patch) | |
tree | 02c2c0fcf08c65a35420d45ab26f10b52cead583 /src | |
parent | 4574441907f099dff71fa71f6c8171ff40f57b1d (diff) | |
parent | 30d844541ad6eda6773c5089aeffd66e20b85956 (diff) |
am 30d84454: am 53accf53: am f167d1ce: am 3edf6c6c: am 0ae490ab: Merge "Fix a bug in the dtmf tone length setting." into mnc-dev
* commit '30d844541ad6eda6773c5089aeffd66e20b85956':
Fix a bug in the dtmf tone length setting.
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/settings/SoundSettingsFragment.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/dialer/settings/SoundSettingsFragment.java b/src/com/android/dialer/settings/SoundSettingsFragment.java index c7bb2d361..7fc9394f8 100644 --- a/src/com/android/dialer/settings/SoundSettingsFragment.java +++ b/src/com/android/dialer/settings/SoundSettingsFragment.java @@ -51,6 +51,9 @@ public class SoundSettingsFragment extends PreferenceFragment private static final int NO_VIBRATION_FOR_CALLS = 0; private static final int DO_VIBRATION_FOR_CALLS = 1; + + private static final int DTMF_TONE_TYPE_NORMAL = 0; + private static final int SHOW_CARRIER_SETTINGS = 0; private static final int HIDE_CARRIER_SETTINGS = 1; @@ -112,7 +115,8 @@ public class SoundSettingsFragment extends PreferenceFragment mDtmfToneLength.setOnPreferenceChangeListener(this); mDtmfToneLength.setValueIndex( Settings.System.getInt(context.getContentResolver(), - Settings.System.DTMF_TONE_WHEN_DIALING, PLAY_DTMF_TONE)); + Settings.System.DTMF_TONE_TYPE_WHEN_DIALING, + DTMF_TONE_TYPE_NORMAL)); } else { getPreferenceScreen().removePreference(mDtmfToneLength); mDtmfToneLength = null; |