Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba2a3697 authored by linyuh's avatar linyuh Committed by Copybara-Service
Browse files

UI fixes for emergency numbers in the old call log. 

Bug: 80426301,80426768
Test: Manual
PiperOrigin-RevId: 198783744
Change-Id: Ib704a710680b3cf18e4c3c91cd48e7b8491671ff
parent 598ab9a2

java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java

+23 −0
Original line number Diff line number Diff line
@@ -599,6 +599,29 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
    setUpVideoButtonView.setVisibility(View.GONE);

    inviteVideoButtonView.setVisibility(View.GONE);



    // For an emergency number, show "Call details" only.

    if (PhoneNumberHelper.isLocalEmergencyNumber(context, number)) {

      createNewContactButtonView.setVisibility(View.GONE);

      addToExistingContactButtonView.setVisibility(View.GONE);

      sendMessageView.setVisibility(View.GONE);

      callWithNoteButtonView.setVisibility(View.GONE);

      callComposeButtonView.setVisibility(View.GONE);

      blockReportView.setVisibility(View.GONE);

      blockView.setVisibility(View.GONE);

      unblockView.setVisibility(View.GONE);

      reportNotSpamView.setVisibility(View.GONE);

      voicemailPlaybackView.setVisibility(View.GONE);



      detailsButtonView.setVisibility(View.VISIBLE);

      detailsButtonView.setTag(

          IntentProvider.getCallDetailIntentProvider(

              callDetailsEntries,

              buildContact(),

              /* canReportCallerId = */ false,

              /* canSupportAssistedDialing = */ false));

      return;

    }



    if (isFullyUndialableVoicemail()) {

      // Sometimes the voicemail server will report the message is from some non phone number

      // source. If the number does not contains any dialable digit treat it as it is from a unknown

java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java

+20 −13
Original line number Diff line number Diff line
@@ -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,6 +158,14 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder 
            contact.getNameOrNumber(),

            contact.getContactType());



    // 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 {

      nameView.setText(contact.getNameOrNumber());

      if (!TextUtils.isEmpty(contact.getDisplayNumber())) {

        numberView.setVisibility(View.VISIBLE);
@@ -168,9 +177,7 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder 
                    contact.getNumberLabel(),

                    contact.getDisplayNumber());

        numberView.setText(secondaryInfo);

    } else {

      numberView.setVisibility(View.GONE);

      numberView.setText(null);

      }

    }



    if (!TextUtils.isEmpty(contact.getSimDetails().getNetwork())) {