From ba2a369716543f954a33bd04c4af5bafbb127393 Mon Sep 17 00:00:00 2001 From: linyuh Date: Thu, 31 May 2018 14:50:56 -0700 Subject: UI fixes for emergency numbers in the old call log. Bug: 80426301,80426768 Test: Manual PiperOrigin-RevId: 198783744 Change-Id: Ib704a710680b3cf18e4c3c91cd48e7b8491671ff --- .../calldetails/CallDetailsHeaderViewHolder.java | 33 +++++++++++++--------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'java/com/android/dialer/calldetails') diff --git a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java index 44b5a4319..4da7fa0dc 100644 --- a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java +++ b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java @@ -40,6 +40,7 @@ import com.android.dialer.dialercontact.DialerContact; import com.android.dialer.glidephotomanager.GlidePhotoManagerComponent; import com.android.dialer.logging.InteractionEvent; import com.android.dialer.logging.Logger; +import com.android.dialer.phonenumberutil.PhoneNumberHelper; import com.android.dialer.widget.BidiTextView; /** @@ -157,20 +158,26 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder contact.getNameOrNumber(), contact.getContactType()); - nameView.setText(contact.getNameOrNumber()); - if (!TextUtils.isEmpty(contact.getDisplayNumber())) { - numberView.setVisibility(View.VISIBLE); - String secondaryInfo = - TextUtils.isEmpty(contact.getNumberLabel()) - ? contact.getDisplayNumber() - : context.getString( - com.android.contacts.common.R.string.call_subject_type_and_number, - contact.getNumberLabel(), - contact.getDisplayNumber()); - numberView.setText(secondaryInfo); + // Hide the secondary text of the header by default. + // We will show it if needed (see below). + numberView.setVisibility(View.GONE); + numberView.setText(null); + + if (PhoneNumberHelper.isLocalEmergencyNumber(context, contact.getNumber())) { + nameView.setText(context.getResources().getString(R.string.emergency_number)); } else { - numberView.setVisibility(View.GONE); - numberView.setText(null); + nameView.setText(contact.getNameOrNumber()); + if (!TextUtils.isEmpty(contact.getDisplayNumber())) { + numberView.setVisibility(View.VISIBLE); + String secondaryInfo = + TextUtils.isEmpty(contact.getNumberLabel()) + ? contact.getDisplayNumber() + : context.getString( + com.android.contacts.common.R.string.call_subject_type_and_number, + contact.getNumberLabel(), + contact.getDisplayNumber()); + numberView.setText(secondaryInfo); + } } if (!TextUtils.isEmpty(contact.getSimDetails().getNetwork())) { -- cgit v1.2.3