commit ca5108d0a25020bf12a324ef2d1ce13d73a9b828
author Flavio Lerda <flerda@google.com> Wed Oct 12 03:47:08 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 12 03:47:08 2011 -0700
tree d72b4f5c1adb9f4836c3631b1856833528fdaead
parent 68fd09dd63e1aeed92fb1519a00121ea3eae5c92
parent 76821d02351701b3829aa5754dd9a86e417f635f

Merge "Only show recent items in the new section." into ics-mr0

src/com/android/contacts/activities/DialtactsActivity.java

diff --git a/src/com/android/contacts/activities/DialtactsActivity.java b/src/com/android/contacts/activities/DialtactsActivity.java
index 05951d6..1501aec 100644
--- a/src/com/android/contacts/activities/DialtactsActivity.java
+++ b/src/com/android/contacts/activities/DialtactsActivity.java
@@ -302,8 +302,11 @@
             new OnPhoneNumberPickerActionListener() {
                 @Override
                 public void onPickPhoneNumberAction(Uri dataUri) {
+                    // Specify call-origin so that users will see the previous tab instead of
+                    // CallLog screen (search UI will be automatically exited).
                     PhoneNumberInteraction.startInteractionForPhoneCall(
-                            DialtactsActivity.this, dataUri);
+                            DialtactsActivity.this, dataUri,
+                            CALL_ORIGIN_DIALTACTS);
                 }
 
                 @Override

src/com/android/contacts/calllog/ContactInfoHelper.java

diff --git a/src/com/android/contacts/calllog/ContactInfoHelper.java b/src/com/android/contacts/calllog/ContactInfoHelper.java
index f4b7daf..c837c9a 100644
--- a/src/com/android/contacts/calllog/ContactInfoHelper.java
+++ b/src/com/android/contacts/calllog/ContactInfoHelper.java
@@ -206,8 +206,7 @@
                 info.photoId = phonesCursor.getLong(PhoneQuery.PHOTO_ID);
                 info.photoUri =
                         UriUtils.parseUriOrNull(phonesCursor.getString(PhoneQuery.PHOTO_URI));
-                info.formattedNumber = formatPhoneNumber(info.number, info.formattedNumber,
-                        countryIso);
+                info.formattedNumber = formatPhoneNumber(number, null, countryIso);
 
             } else {
                 info = ContactInfo.EMPTY;