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

Commit e46a990c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4719555 from edc44d7a to qt-release 

Change-Id: I45ee7c727ef7c6e287bf74b6c541ec46f9ab4918
parents 1a5b35d4 edc44d7a

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

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.net.Uri; 
import android.provider.CallLog.Calls;

import android.provider.ContactsContract.CommonDataKinds.Phone;

import android.support.v4.content.ContextCompat;

import android.support.v4.os.BuildCompat;

import android.telecom.PhoneAccount;

import android.telecom.PhoneAccountHandle;

import android.telephony.PhoneNumberUtils;
@@ -161,6 +162,9 @@ public class PhoneCallDetailsHelper 
    views.callTypeIcons.setShowAssistedDialed(

        (details.features & TelephonyManagerCompat.FEATURES_ASSISTED_DIALING)

            == TelephonyManagerCompat.FEATURES_ASSISTED_DIALING);

    if (BuildCompat.isAtLeastP()) {

      views.callTypeIcons.setShowRtt((details.features & Calls.FEATURES_RTT) == Calls.FEATURES_RTT);

    }

    views.callTypeIcons.requestLayout();

    views.callTypeIcons.setVisibility(View.VISIBLE);

java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.dialer.precall.PreCallComponent; 
import com.android.dialer.preferredsim.suggestion.SimSuggestionComponent;

import com.android.dialer.simulator.SimulatorComponent;

import com.android.dialer.spam.SpamComponent;

import com.android.dialer.speeddial.loader.UiItemLoaderComponent;

import com.android.dialer.storage.StorageComponent;

import com.android.dialer.strictmode.StrictModeComponent;

import com.android.incallui.calllocation.CallLocationComponent;
@@ -67,6 +68,7 @@ public interface BaseDialerRootComponent 
        PhoneLookupDatabaseComponent.HasComponent,

        PhoneNumberGeoUtilComponent.HasComponent,

        PreCallComponent.HasComponent,

        UiItemLoaderComponent.HasComponent,

        SimSuggestionComponent.HasComponent,

        SimulatorComponent.HasComponent,

        SpamComponent.HasComponent,

java/com/android/dialer/calldetails/CallDetailsActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ public final class CallDetailsActivity extends CallDetailsActivityCommon { 


    private void updateCallDetailsEntries(CallDetailsEntries newEntries) {

      activity.setCallDetailsEntries(newEntries);

      activity.getAdapter().updateCallDetailsEntries(newEntries);

      EnrichedCallComponent.get(activity)

          .getEnrichedCallManager()

          .requestAllHistoricalData(activity.getNumber(), newEntries);

java/com/android/dialer/calldetails/CallDetailsActivityCommon.java

+49 −1
Original line number Diff line number Diff line
@@ -26,9 +26,11 @@ import android.os.Bundle; 
import android.provider.CallLog;

import android.provider.CallLog.Calls;

import android.support.annotation.CallSuper;

import android.support.annotation.MainThread;

import android.support.annotation.NonNull;

import android.support.annotation.Nullable;

import android.support.annotation.RequiresPermission;

import android.support.annotation.WorkerThread;

import android.support.v7.app.AppCompatActivity;

import android.support.v7.widget.LinearLayoutManager;

import android.support.v7.widget.RecyclerView;
@@ -45,6 +47,7 @@ import com.android.dialer.common.concurrent.DialerExecutor.FailureListener; 
import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;

import com.android.dialer.common.concurrent.DialerExecutor.Worker;

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

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

import com.android.dialer.common.database.Selection;

import com.android.dialer.constants.ActivityRequestCodes;

import com.android.dialer.duo.Duo;
@@ -58,7 +61,9 @@ import com.android.dialer.logging.UiAction; 
import com.android.dialer.performancereport.PerformanceReport;

import com.android.dialer.postcall.PostCall;

import com.android.dialer.precall.PreCall;

import com.android.dialer.rtt.RttTranscriptUtil;

import com.google.common.base.Preconditions;

import com.google.common.util.concurrent.ListenableFuture;

import com.google.i18n.phonenumbers.NumberParseException;

import com.google.i18n.phonenumbers.PhoneNumberUtil;

import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
@@ -91,6 +96,7 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { 


  private CallDetailsAdapterCommon adapter;

  private CallDetailsEntries callDetailsEntries;

  private UiListener<CallDetailsEntries> checkRttTranscriptAvailabilityListener;



  /**

   * Handles the intent that launches {@link OldCallDetailsActivity} or {@link CallDetailsActivity},
@@ -121,6 +127,9 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { 
        });

    handleIntent(getIntent());

    setupRecyclerViewForEntries();

    checkRttTranscriptAvailabilityListener =

        DialerExecutorComponent.get(this)

            .createUiListener(getFragmentManager(), "Query RTT transcript availability");

  }



  @Override
@@ -143,6 +152,40 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { 
    EnrichedCallComponent.get(this)

        .getEnrichedCallManager()

        .requestAllHistoricalData(getNumber(), callDetailsEntries);

    checkRttTranscriptAvailabilityListener.listen(

        this,

        checkRttTranscriptAvailability(),

        this::setCallDetailsEntries,

        throwable -> {

          throw new RuntimeException(throwable);

        });

  }



  private ListenableFuture<CallDetailsEntries> checkRttTranscriptAvailability() {

    return DialerExecutorComponent.get(this)

        .backgroundExecutor()

        .submit(() -> checkRttTranscriptAvailabilityInBackground(callDetailsEntries));

  }



  /**

   * Check RTT transcript availability.

   *

   * @param input the original {@link CallDetailsEntries}

   * @return {@link CallDetailsEntries} with updated RTT transcript availability.

   */

  @WorkerThread

  private CallDetailsEntries checkRttTranscriptAvailabilityInBackground(

      @Nullable CallDetailsEntries input) {

    RttTranscriptUtil rttTranscriptUtil = new RttTranscriptUtil(this);



    CallDetailsEntries.Builder mutableCallDetailsEntries = CallDetailsEntries.newBuilder();

    for (CallDetailsEntry entry : input.getEntriesList()) {

      CallDetailsEntry.Builder newEntry = CallDetailsEntry.newBuilder().mergeFrom(entry);

      newEntry.setHasRttTranscript(

          rttTranscriptUtil.checkRttTranscriptAvailability(String.valueOf(entry.getDate())));

      mutableCallDetailsEntries.addEntries(newEntry.build());

    }

    return mutableCallDetailsEntries.build();

  }



  @Override
@@ -185,8 +228,13 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { 
    super.onBackPressed();

  }



  @MainThread

  protected final void setCallDetailsEntries(CallDetailsEntries entries) {

    Assert.isMainThread();

    this.callDetailsEntries = entries;

    if (adapter != null) {

      adapter.updateCallDetailsEntries(entries);

    }

  }



  protected final CallDetailsEntries getCallDetailsEntries() {
@@ -415,7 +463,7 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { 
      Map<CallDetailsEntry, List<HistoryResult>> mappedResults =

          getAllHistoricalData(activity.getNumber(), activity.callDetailsEntries);



      activity.adapter.updateCallDetailsEntries(

      activity.setCallDetailsEntries(

          generateAndMapNewCallDetailsEntriesHistoryResults(

              activity.getNumber(), activity.callDetailsEntries, mappedResults));

    }

java/com/android/dialer/calldetails/CallDetailsAdapterCommon.java

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.dialer.calldetails; 


import android.content.Context;

import android.support.annotation.CallSuper;

import android.support.annotation.MainThread;

import android.support.v7.widget.RecyclerView;

import android.support.v7.widget.RecyclerView.ViewHolder;

import android.view.LayoutInflater;
@@ -137,7 +138,9 @@ abstract class CallDetailsAdapterCommon extends RecyclerView.Adapter<RecyclerVie 
    return callDetailsEntries;

  }



  @MainThread

  final void updateCallDetailsEntries(CallDetailsEntries entries) {

    Assert.isMainThread();

    callDetailsEntries = entries;

    notifyDataSetChanged();

  }