am 9ae4c3d3: am f4f12292: Don\'t update call card when new info is worse
* commit '9ae4c3d319f915c4619f0269933a1daa39b0c486':
Don't update call card when new info is worse
diff --git a/src/com/android/phone/CallCard.java b/src/com/android/phone/CallCard.java
index 4c6822c..80b6fd8 100644
--- a/src/com/android/phone/CallCard.java
+++ b/src/com/android/phone/CallCard.java
@@ -1202,6 +1202,7 @@
mPhotoTracker.setPhotoState(ContactsAsyncHelper.ImageTracker.DISPLAY_IMAGE);
// The actual strings we're going to display onscreen:
+ boolean displayNameIsNumber = false;
String displayName;
String displayNumber = null;
String label = null;
@@ -1269,6 +1270,7 @@
// Promote the phone number up to the "name" slot:
displayName = number;
+ displayNameIsNumber = true;
// ...and use the "number" slot for a geographical description
// string if available (but only for incoming calls.)
@@ -1307,12 +1309,50 @@
displayName = PhoneUtils.getPresentationString(getContext(), presentation);
}
- if (call.isGeneric()) {
- mName.setText(R.string.card_title_in_call);
- } else {
- mName.setText(displayName);
+ boolean updateNameAndNumber = true;
+ // If the new info is just a phone number, check to make sure it's not less
+ // information than what's already being displayed.
+ if (displayNameIsNumber) {
+ // If the new number is the same as the number already displayed, ignore it
+ // because that means we're also already displaying a name for it.
+ // If the new number is the same as the name currently being displayed, only
+ // display if the new number is longer (ie, has formatting).
+ String visiblePhoneNumber = null;
+ if (mPhoneNumber.getVisibility() == View.VISIBLE) {
+ visiblePhoneNumber = mPhoneNumber.getText().toString();
+ }
+ if ((visiblePhoneNumber != null &&
+ PhoneNumberUtils.compare(visiblePhoneNumber, displayName)) ||
+ (PhoneNumberUtils.compare(mName.getText().toString(), displayName) &&
+ displayName.length() < mName.length())) {
+ if (DBG) log("chose not to update display {" + mName.getText() + ", "
+ + visiblePhoneNumber + "} with number " + displayName);
+ updateNameAndNumber = false;
+ }
}
- mName.setVisibility(View.VISIBLE);
+
+ if (updateNameAndNumber) {
+ if (call.isGeneric()) {
+ mName.setText(R.string.card_title_in_call);
+ } else {
+ mName.setText(displayName);
+ }
+ mName.setVisibility(View.VISIBLE);
+
+ if (displayNumber != null && !call.isGeneric()) {
+ mPhoneNumber.setText(displayNumber);
+ mPhoneNumber.setVisibility(View.VISIBLE);
+ } else {
+ mPhoneNumber.setVisibility(View.GONE);
+ }
+
+ if (label != null && !call.isGeneric()) {
+ mLabel.setText(label);
+ mLabel.setVisibility(View.VISIBLE);
+ } else {
+ mLabel.setVisibility(View.GONE);
+ }
+ }
// Update mPhoto
// if the temporary flag is set, we know we'll be getting another call after
@@ -1369,20 +1409,6 @@
AnimationUtils.Fade.hide(mPhotoDimEffect, View.GONE);
}
- if (displayNumber != null && !call.isGeneric()) {
- mPhoneNumber.setText(displayNumber);
- mPhoneNumber.setVisibility(View.VISIBLE);
- } else {
- mPhoneNumber.setVisibility(View.GONE);
- }
-
- if (label != null && !call.isGeneric()) {
- mLabel.setText(label);
- mLabel.setVisibility(View.VISIBLE);
- } else {
- mLabel.setVisibility(View.GONE);
- }
-
// Other text fields:
updateCallTypeLabel(call);
// updateSocialStatus(socialStatusText, socialStatusBadge, call); // Currently unused
