diff options
| -rw-r--r-- | res/values/dimens.xml | 15 | ||||
| -rw-r--r-- | res/values/strings.xml | 14 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 4 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/ContactInfoHelper.java | 2 |
4 files changed, 6 insertions, 29 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index e5c6795d5..18f069441 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -78,21 +78,6 @@ <dimen name="dismiss_button_padding_start">20dip</dimen> <dimen name="dismiss_button_padding_end">28dip</dimen> - <!-- Padding above the favorites menu. --> - <dimen name="favorites_menu_padding_top">6dp</dimen> - <!-- Padding below the favorites menu.. --> - <dimen name="favorites_menu_padding_bottom">3dp</dimen> - <!-- Horizontal padding in the favorites menu. --> - <dimen name="favorites_menu_padding_horizontal">8dp</dimen> - <!-- Text size for the "speed dial" text in the favorites menu. --> - <dimen name="favorites_menu_speed_dial_text_size">18sp</dimen> - <!-- Height of the speed dial TextView in the favorites menu. --> - <dimen name="favorites_menu_speed_dial_height">24dp</dimen> - <!-- Text size for the "All Contacts" text in the favorites menu. --> - <dimen name="favorites_menu_all_contacts_text_size">12sp</dimen> - <!-- Height of the all contacts Button in the favorites menu. --> - <dimen name="favorites_menu_all_contacts_height">24dp</dimen> - <!-- Height of the actionBar - this is 8dps bigger than the platform standard to give more room to the search box--> <dimen name="action_bar_height">64dp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 481611463..88e29e154 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -613,24 +613,12 @@ <!-- Remove button that shows up when contact is long-pressed. [CHAR LIMIT=NONE] --> <string name="remove_contact">Remove</string> - <!-- Header text displayed on the main dialer screen above the list of favorite phone numbers. - [CHAR LIMIT=21] --> - <string name="favorites_menu_speed_dial">Speed Dial</string> - <!-- Button text for the "all contacts" button displayed on the main dialer screen above the list of favorite phone numbers. Navigates the user to the "All Contacts" list. This text represents the same action as the text in string "menu_allContacts". [CHAR LIMIT=21] --> <string name="favorites_menu_all_contacts">ALL CONTACTS</string> - <!-- The font-family to use for the "speed dial" label on the favorites menu. - Do not translate. --> - <string name="favorites_menu_speed_dial_font_family">sans-serif-light</string> - - <!-- The font-family to use for the "all contacts" label on the favorites menu. - Do not translate. --> - <string name="favorites_menu_all_contacts_font_family">sans-serif</string> - <!-- Button text for the "call back" button displayed underneath an entry in the call log. Tapping causes a call to be placed to the caller represented by the call log entry. [CHAR LIMIT=30] --> @@ -700,7 +688,7 @@ <!-- String used as a header in the call log above calls which occurred more than a week ago. [CHAR LIMIT=65] --> - <string name="call_log_header_other">Other</string> + <string name="call_log_header_other">Older</string> <!-- String a header on the call details screen. Appears above the list calls to or from a particular number. diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 4b1aeabe5..249c30c41 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -1096,7 +1096,9 @@ public class CallLogAdapter extends GroupingListAdapter values.put(Calls.CACHED_LOOKUP_URI, UriUtils.uriToString(updatedInfo.lookupUri)); needsUpdate = true; } - if (!TextUtils.equals(updatedInfo.normalizedNumber, callLogInfo.normalizedNumber)) { + // Only replace the normalized number if the new updated normalized number isn't empty. + if (!TextUtils.isEmpty(updatedInfo.normalizedNumber) && + !TextUtils.equals(updatedInfo.normalizedNumber, callLogInfo.normalizedNumber)) { values.put(Calls.CACHED_NORMALIZED_NUMBER, updatedInfo.normalizedNumber); needsUpdate = true; } diff --git a/src/com/android/dialer/calllog/ContactInfoHelper.java b/src/com/android/dialer/calllog/ContactInfoHelper.java index 5d99ef4fb..1bebfc416 100644 --- a/src/com/android/dialer/calllog/ContactInfoHelper.java +++ b/src/com/android/dialer/calllog/ContactInfoHelper.java @@ -101,6 +101,8 @@ public class ContactInfoHelper { updatedInfo = new ContactInfo(); updatedInfo.number = number; updatedInfo.formattedNumber = formatPhoneNumber(number, null, countryIso); + updatedInfo.normalizedNumber = PhoneNumberUtils.formatNumberToE164( + number, countryIso); updatedInfo.lookupUri = createTemporaryContactUri(updatedInfo.formattedNumber); } else { updatedInfo = info; |