diff options
author | Roshan Pius <rpius@google.com> | 2015-07-13 23:17:47 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-13 23:17:48 +0000 |
commit | 0ae490ab4661b4aa05c0a800bb900878e4e1214a (patch) | |
tree | 77f76faf1fab43ee93c944e0efce6a4869ea2057 /src | |
parent | 1e4ca7d40ebdaa67f05425687413e2b9fa25b9bf (diff) | |
parent | 191c5b5e18f45f7652015a6f8581180ea57e0b48 (diff) |
Merge "Fix a bug in the dtmf tone length setting." into mnc-dev
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; |