commit 3edf6c6c87dabe88b6085d8d3475ce9e4bfa30e8
author Roshan Pius <rpius@google.com> Mon Jul 13 23:31:16 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 13 23:31:16 2015 +0000
tree 77f76faf1fab43ee93c944e0efce6a4869ea2057
parent 28dfdca432793a812b10a5b723b6bc83b86544ee
parent 0ae490ab4661b4aa05c0a800bb900878e4e1214a

am 0ae490ab: Merge "Fix a bug in the dtmf tone length setting." into mnc-dev

* commit '0ae490ab4661b4aa05c0a800bb900878e4e1214a':
  Fix a bug in the dtmf tone length setting.

src/com/android/dialer/settings/SoundSettingsFragment.java

diff --git a/src/com/android/dialer/settings/SoundSettingsFragment.java b/src/com/android/dialer/settings/SoundSettingsFragment.java
index c7bb2d3..7fc9394 100644
--- a/src/com/android/dialer/settings/SoundSettingsFragment.java
+++ b/src/com/android/dialer/settings/SoundSettingsFragment.java
@@ -51,6 +51,9 @@
     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 @@
             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;