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

Commit 2e72cdf3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I3d2b23b5,I9463e2c9 

* changes:
  Updating SecondaryInfo value class to use AutoValue with builder pattern.
  Added same primes metrics that existed in Dialtacts to NUI.
parents 4865a35f 9e335e2d

java/com/android/dialer/main/impl/OldMainActivityPeer.java

+11 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import com.android.dialer.callintent.CallSpecificAppData; 
import com.android.dialer.common.FragmentUtils.FragmentUtilListener;

import com.android.dialer.common.LogUtil;

import com.android.dialer.common.concurrent.DialerExecutorComponent;

import com.android.dialer.common.concurrent.ThreadUtil;

import com.android.dialer.common.concurrent.UiListener;

import com.android.dialer.compat.CompatUtils;

import com.android.dialer.configprovider.ConfigProviderBindings;
@@ -87,6 +88,8 @@ import com.android.dialer.main.impl.bottomnav.BottomNavBar; 
import com.android.dialer.main.impl.bottomnav.BottomNavBar.OnBottomNavTabSelectedListener;

import com.android.dialer.main.impl.bottomnav.BottomNavBar.TabIndex;

import com.android.dialer.main.impl.toolbar.MainToolbar;

import com.android.dialer.metrics.Metrics;

import com.android.dialer.metrics.MetricsComponent;

import com.android.dialer.postcall.PostCall;

import com.android.dialer.precall.PreCall;

import com.android.dialer.searchfragment.list.NewSearchFragment.SearchFragmentListener;
@@ -404,6 +407,14 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 
    } else {

      bottomNav.setVisibility(View.VISIBLE);

    }



    // add 1 sec delay to get memory snapshot so that dialer wont react slowly on resume.

    ThreadUtil.postDelayedOnUiThread(

        () ->

            MetricsComponent.get(mainActivity)

                .metrics()

                .recordMemory(Metrics.OLD_MAIN_ACTIVITY_PEER_ON_RESUME_MEMORY_EVENT_NAME),

        1000);

  }



  @Override

java/com/android/dialer/metrics/Metrics.java

+2 −0
Original line number Diff line number Diff line
@@ -23,11 +23,13 @@ public interface Metrics { 


  String APPLICATION_ON_CREATE_EVENT_NAME = "Application.onCreate";

  String DIALTACTS_ON_CREATE_EVENT_NAME = "GoogleDialtactsActivity.onCreate";

  String MAIN_ACTIVITY_ON_CREATE_EVENT_NAME = "GoogleMainActivity.onCreate";

  String ON_CALL_ADDED_TO_ON_INCALL_UI_SHOWN_INCOMING =

      "CallList.onCallAdded_To_InCallActivity.onCreate_Incoming";

  String ON_CALL_ADDED_TO_ON_INCALL_UI_SHOWN_OUTGOING =

      "CallList.onCallAdded_To_InCallActivity.onCreate_Outgoing";

  String DIALTACTS_ON_RESUME_MEMORY_EVENT_NAME = "GoogleDialtactsActivity.onResume";

  String OLD_MAIN_ACTIVITY_PEER_ON_RESUME_MEMORY_EVENT_NAME = "OldMainActivityPeer.onResume";

  String INCALL_ACTIVITY_ON_RESUME_MEMORY_EVENT_NAME = "IncallActivity.OnResume";

  String INCALL_ACTIVITY_ON_STOP_MEMORY_EVENT_NAME = "IncallActivity.OnStop";

  String OLD_CALL_LOG_JANK_EVENT_NAME = "OldCallLog.Jank";

java/com/android/incallui/CallCardPresenter.java

+22 −22
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ public class CallCardPresenter 


    if (secondary == null) {

      // Clear the secondary display info.

      inCallScreen.setSecondary(SecondaryInfo.createEmptySecondaryInfo(isFullscreen));

      inCallScreen.setSecondary(SecondaryInfo.builder().setIsFullscreen(isFullscreen).build());

      return;

    }
@@ -915,39 +915,39 @@ public class CallCardPresenter 
      LogUtil.i(

          "CallCardPresenter.updateSecondaryDisplayInfo",

          "secondary call is merge in process, clearing info");

      inCallScreen.setSecondary(SecondaryInfo.createEmptySecondaryInfo(isFullscreen));

      inCallScreen.setSecondary(SecondaryInfo.builder().setIsFullscreen(isFullscreen).build());

      return;

    }



    if (secondary.isConferenceCall()) {

      inCallScreen.setSecondary(

          new SecondaryInfo(

              true /* show */,

          SecondaryInfo.builder()

              .setShouldShow(true)

              .setName(

                  CallerInfoUtils.getConferenceString(

                  context, secondary.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)),

              false /* nameIsNumber */,

              null /* label */,

              secondary.getCallProviderLabel(),

              true /* isConference */,

              secondary.isVideoCall(),

              isFullscreen));

                      context, secondary.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)))

              .setProviderLabel(secondary.getCallProviderLabel())

              .setIsConference(true)

              .setIsVideoCall(secondary.isVideoCall())

              .setIsFullscreen(isFullscreen)

              .build());

    } else if (secondaryContactInfo != null) {

      LogUtil.v("CallCardPresenter.updateSecondaryDisplayInfo", "" + secondaryContactInfo);

      String name = getNameForCall(secondaryContactInfo);

      boolean nameIsNumber = name != null && name.equals(secondaryContactInfo.number);

      inCallScreen.setSecondary(

          new SecondaryInfo(

              true /* show */,

              secondary.updateNameIfRestricted(name),

              nameIsNumber,

              secondaryContactInfo.label,

              secondary.getCallProviderLabel(),

              false /* isConference */,

              secondary.isVideoCall(),

              isFullscreen));

          SecondaryInfo.builder()

              .setShouldShow(true)

              .setName(secondary.updateNameIfRestricted(name))

              .setNameIsNumber(nameIsNumber)

              .setLabel(secondaryContactInfo.label)

              .setProviderLabel(secondary.getCallProviderLabel())

              .setIsVideoCall(secondary.isVideoCall())

              .setIsFullscreen(isFullscreen)

              .build());

    } else {

      // Clear the secondary display info.

      inCallScreen.setSecondary(SecondaryInfo.createEmptySecondaryInfo(isFullscreen));

      inCallScreen.setSecondary(SecondaryInfo.builder().setIsFullscreen(isFullscreen).build());

    }

  }

java/com/android/incallui/hold/OnHoldFragment.java

+4 −4
Original line number Diff line number Diff line
@@ -59,14 +59,14 @@ public class OnHoldFragment extends Fragment { 


    ((TextView) view.findViewById(R.id.hold_contact_name))

        .setText(

            secondaryInfo.nameIsNumber

            secondaryInfo.nameIsNumber()

                ? PhoneNumberUtils.createTtsSpannable(

                    BidiFormatter.getInstance()

                        .unicodeWrap(secondaryInfo.name, TextDirectionHeuristics.LTR))

                : secondaryInfo.name);

                        .unicodeWrap(secondaryInfo.name(), TextDirectionHeuristics.LTR))

                : secondaryInfo.name());

    ((ImageView) view.findViewById(R.id.hold_phone_icon))

        .setImageResource(

            secondaryInfo.isVideoCall

            secondaryInfo.isVideoCall()

                ? R.drawable.quantum_ic_videocam_white_18

                : R.drawable.quantum_ic_phone_paused_vd_theme_24);

    view.addOnAttachStateChangeListener(

java/com/android/incallui/incall/impl/InCallFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ public class InCallFragment extends Fragment 
    savedSecondaryInfo = null;

    FragmentTransaction transaction = getChildFragmentManager().beginTransaction();

    Fragment oldBanner = getChildFragmentManager().findFragmentById(R.id.incall_on_hold_banner);

    if (secondaryInfo.shouldShow) {

    if (secondaryInfo.shouldShow()) {

      transaction.replace(R.id.incall_on_hold_banner, OnHoldFragment.newInstance(secondaryInfo));

    } else {

      if (oldBanner != null) {