commit a8fd33fdb65b936bd130a6d9c6bd4b3615d24886
author Yorke Lee <yorkelee@google.com> Mon May 13 18:31:57 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 13 18:31:57 2013 +0000
tree 7be6dd5d0f7dd9e1249226101403433fca1560ce
parent f744f53ed980ba901b458b070a1b5eb4526b69f3
parent 50e3bc935962ca360d7a681cd8be90b2eee77ea6

Merge "Setting to toggle smart dialing on/off" into jb-mr2-dev

src/com/android/dialer/dialpad/DialpadFragment.java

diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index ab632e1..ba82774 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -399,7 +399,9 @@
                     String data = uri.getSchemeSpecificPart();
                     // Remember it is filled via Intent.
                     mDigitsFilledByIntent = true;
-                    setFormattedDigits(data, null);
+                    final String converted = PhoneNumberUtils.convertKeypadLettersToDigits(
+                            PhoneNumberUtils.replaceUnicodeDigits(data));
+                    setFormattedDigits(converted, null);
                     return true;
                 } else {
                     String type = intent.getType();

src/com/android/dialer/dialpad/UnicodeDialerKeyListener.java

diff --git a/src/com/android/dialer/dialpad/UnicodeDialerKeyListener.java b/src/com/android/dialer/dialpad/UnicodeDialerKeyListener.java
index c25c7a9..740b456 100644
--- a/src/com/android/dialer/dialpad/UnicodeDialerKeyListener.java
+++ b/src/com/android/dialer/dialpad/UnicodeDialerKeyListener.java
@@ -31,7 +31,8 @@
     @Override
     public CharSequence filter(CharSequence source, int start, int end,
             Spanned dest, int dstart, int dend) {
-        CharSequence converted = PhoneNumberUtils.replaceUnicodeDigits(source.toString());
+        final String converted = PhoneNumberUtils.convertKeypadLettersToDigits(
+                PhoneNumberUtils.replaceUnicodeDigits(source.toString()));
         // PhoneNumberUtils.replaceUnicodeDigits performs a character for character replacement,
         // so we can assume that start and end positions should remain unchanged.
         CharSequence result = super.filter(converted, start, end, dest, dstart, dend);