resolved conflicts for merge of 7206436b to master

Change-Id: I06aea6c87970c98a539785c1c1bb51eb08ab1495

1 files changed, 18 insertions, 1 deletions

diff --git a/src/com/android/dialer/list/RegularSearchListAdapter.java b/src/com/android/dialer/list/RegularSearchListAdapter.java
index 75c89e13f..f431e6a44 100644
--- a/src/com/android/dialer/list/RegularSearchListAdapter.java
+++ b/src/com/android/dialer/list/RegularSearchListAdapter.java
@@ -79,8 +79,11 @@ public class RegularSearchListAdapter extends DialerPhoneNumberListAdapter {
 
     @Override
     public void setQueryString(String queryString) {
-        final boolean showNumberShortcuts = !TextUtils.isEmpty(getFormattedQueryString());
+        // Don't show actions if the query string contains a letter.
+        final boolean showNumberShortcuts = !TextUtils.isEmpty(getFormattedQueryString())
+                && hasDigitsInQueryString();
         mIsQuerySipAddress = PhoneNumberHelper.isUriNumber(queryString);
+
         boolean changed = false;
         changed |= setShortcutEnabled(SHORTCUT_DIRECT_CALL,
                 showNumberShortcuts || mIsQuerySipAddress);
@@ -92,4 +95,18 @@ public class RegularSearchListAdapter extends DialerPhoneNumberListAdapter {
         }
         super.setQueryString(queryString);
     }
+
+    /**
+     * Whether there is at least one digit in the query string.
+     */
+    private boolean hasDigitsInQueryString() {
+        String queryString = getQueryString();
+        int length = queryString.length();
+        for (int i = 0; i < length; i++) {
+            if (Character.isDigit(queryString.charAt(i))) {
+                return true;
+            }
+        }
+        return false;
+    }
 }