Dialer: Don't delete '+' for number when enter select contact interface

The number we get from adapter has been formatted, so the '+' is
deleted.

Use the original number that we input When entering the select
contact interface.

CRs-Fixed: 662672

Conflicts:
	src/com/android/dialer/DialtactsActivity.java

Change-Id: I8fd5774be4ae03abf249409b4f869bd9adaed29c

2 files changed, 12 insertions, 1 deletions

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 472a907a1..7231031c6 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -190,6 +190,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
     private View mFragmentsSpacer;
     private View mFragmentsFrame;
 
+    private String mRegularNumber;
+
     private boolean mInDialpadSearch;
     private boolean mInRegularSearch;
     private boolean mClearSearchOnPause;
@@ -363,6 +365,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
                     if (dialpadSearch && mSmartDialSearchFragment != null) {
                             mSmartDialSearchFragment.setQueryString(newText, false);
                             mSmartDialSearchFragment.setDialpadQueryString(s.toString());
+                            mSmartDialSearchFragment.setRegularQueryString(mRegularNumber);
                     } else if (mRegularSearchFragment != null) {
                         mRegularSearchFragment.setQueryString(newText, false);
                     }
@@ -1100,6 +1103,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
     @Override
     public void onDialpadQueryChanged(String query) {
         final String normalizedQuery = query;
+        mRegularNumber = query;
         if (!TextUtils.equals(mSearchView.getText(), normalizedQuery)) {
             if (DEBUG) {
                 Log.d(TAG, "onDialpadQueryChanged - new query: " + query);
diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java
index 2b524df5d..d7b0ef3f1 100644
--- a/src/com/android/dialer/list/SearchFragment.java
+++ b/src/com/android/dialer/list/SearchFragment.java
@@ -38,6 +38,8 @@ public class SearchFragment extends PhoneNumberPickerFragment {
 
     private OnListFragmentScrolledListener mActivityScrollListener;
 
+    private String mRegularQueryString;
+
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
@@ -114,7 +116,8 @@ public class SearchFragment extends PhoneNumberPickerFragment {
                 listener.onCallNumberDirectly(getQueryString());
             }
         } else if (shortcutType == DialerPhoneNumberListAdapter.SHORTCUT_ADD_NUMBER_TO_CONTACTS) {
-            final String number = adapter.getFormattedQueryString();
+            final String number = mRegularQueryString != null ? mRegularQueryString
+                    : adapter.getFormattedQueryString();
             final Intent intent = DialtactsActivity.getAddNumberToContactIntent(number);
             startActivityWithErrorToast(intent);
         }
@@ -129,4 +132,8 @@ public class SearchFragment extends PhoneNumberPickerFragment {
             toast.show();
         }
     }
+
+    public void setRegularQueryString(String query) {
+        mRegularQueryString = query;
+    }
 }