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

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

Merge changes Idbaca1df,Ie7824ce2,Id24b2318,Ib40632fe,I292f23ea, ... 

* changes:
  Do no preload dialpad fragment when opening search through search bar.
  Add logging to NUI.
  Implemented hangouts connection into GoogleMainActivity.
  Created a "Metrics" interface.
  Fix the icon & the label for blocked spam numbers in the new call log.
  Move RttChatBot to simulator.
  Update RTT call with real name/number and timer.
  Include both PHOTO_URI and PHOTO_THUMBNAIL_URI in Cp2Info.
  Add simulator RTT call.
parents c54ce265 a9776efc

java/com/android/dialer/binary/aosp/AospDialerRootComponent.java

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.dialer.enrichedcall.stub.StubEnrichedCallModule; 
import com.android.dialer.feedback.stub.StubFeedbackModule;

import com.android.dialer.glidephotomanager.GlidePhotoManagerModule;

import com.android.dialer.inject.ContextModule;

import com.android.dialer.metrics.StubMetricsModule;

import com.android.dialer.phonelookup.PhoneLookupModule;

import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule;

import com.android.dialer.precall.impl.PreCallModule;
@@ -63,6 +64,7 @@ import javax.inject.Singleton; 
    StubDuoModule.class,

    StubEnrichedCallModule.class,

    StubNewBubbleModule.class,

    StubMetricsModule.class,

    StubFeedbackModule.class,

    StubMapsModule.class,

    StubSimSuggestionModule.class,

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

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.dialer.enrichedcall.EnrichedCallComponent; 
import com.android.dialer.feedback.FeedbackComponent;

import com.android.dialer.glidephotomanager.GlidePhotoManagerComponent;

import com.android.dialer.main.MainComponent;

import com.android.dialer.metrics.MetricsComponent;

import com.android.dialer.phonelookup.PhoneLookupComponent;

import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtilComponent;

import com.android.dialer.precall.PreCallComponent;
@@ -59,6 +60,7 @@ public interface BaseDialerRootComponent 
        GlidePhotoManagerComponent.HasComponent,

        MainComponent.HasComponent,

        MapsComponent.HasComponent,

        MetricsComponent.HasComponent,

        NewBubbleComponent.HasComponent,

        PhoneLookupComponent.HasComponent,

        PhoneNumberGeoUtilComponent.HasComponent,

java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.dialer.enrichedcall.stub.StubEnrichedCallModule; 
import com.android.dialer.feedback.stub.StubFeedbackModule;

import com.android.dialer.glidephotomanager.GlidePhotoManagerModule;

import com.android.dialer.inject.ContextModule;

import com.android.dialer.metrics.StubMetricsModule;

import com.android.dialer.phonelookup.PhoneLookupModule;

import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule;

import com.android.dialer.precall.impl.PreCallModule;
@@ -67,6 +68,7 @@ import javax.inject.Singleton; 
    StubDuoModule.class,

    StubEnrichedCallModule.class,

    StubFeedbackModule.class,

    StubMetricsModule.class,

    StubNewBubbleModule.class,

    StubSimSuggestionModule.class,

    StubSpamModule.class,

java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java

+2 −18
Original line number Diff line number Diff line
@@ -28,18 +28,17 @@ import android.text.TextUtils; 
import android.util.ArrayMap;

import android.util.ArraySet;

import com.android.dialer.DialerPhoneNumber;

import com.android.dialer.NumberAttributes;

import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;

import com.android.dialer.calllog.datasources.CallLogDataSource;

import com.android.dialer.calllog.datasources.CallLogMutations;

import com.android.dialer.calllog.datasources.util.RowCombiner;

import com.android.dialer.calllogutils.NumberAttributesConverter;

import com.android.dialer.common.Assert;

import com.android.dialer.common.LogUtil;

import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;

import com.android.dialer.common.concurrent.Annotations.LightweightExecutor;

import com.android.dialer.phonelookup.PhoneLookup;

import com.android.dialer.phonelookup.PhoneLookupInfo;

import com.android.dialer.phonelookup.consolidator.PhoneLookupInfoConsolidator;

import com.android.dialer.phonelookup.database.contract.PhoneLookupHistoryContract;

import com.android.dialer.phonelookup.database.contract.PhoneLookupHistoryContract.PhoneLookupHistory;

import com.google.common.collect.ImmutableMap;
@@ -573,23 +572,8 @@ public final class PhoneLookupDataSource 
  }



  private void updateContentValues(ContentValues contentValues, PhoneLookupInfo phoneLookupInfo) {

    PhoneLookupInfoConsolidator phoneLookupInfoConsolidator =

        new PhoneLookupInfoConsolidator(phoneLookupInfo);

    contentValues.put(

        AnnotatedCallLog.NUMBER_ATTRIBUTES,

        NumberAttributes.newBuilder()

            .setName(phoneLookupInfoConsolidator.getName())

            .setPhotoUri(phoneLookupInfoConsolidator.getPhotoUri())

            .setPhotoId(phoneLookupInfoConsolidator.getPhotoId())

            .setLookupUri(phoneLookupInfoConsolidator.getLookupUri())

            .setNumberTypeLabel(phoneLookupInfoConsolidator.getNumberLabel())

            .setIsBusiness(phoneLookupInfoConsolidator.isBusiness())

            .setIsVoicemail(phoneLookupInfoConsolidator.isVoicemail())

            .setIsBlocked(phoneLookupInfoConsolidator.isBlocked())

            .setIsSpam(phoneLookupInfoConsolidator.isSpam())

            .setCanReportAsInvalidNumber(phoneLookupInfoConsolidator.canReportAsInvalidNumber())

            .setIsCp2InfoIncomplete(phoneLookupInfoConsolidator.isCp2LocalInfoIncomplete())

            .build()

            .toByteArray());

        NumberAttributesConverter.fromPhoneLookupInfo(phoneLookupInfo).build().toByteArray());

  }

}

java/com/android/dialer/calllog/ui/RealtimeRowProcessor.java

+2 −18
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ import android.support.annotation.MainThread; 
import android.support.annotation.VisibleForTesting;

import android.util.ArrayMap;

import com.android.dialer.DialerPhoneNumber;

import com.android.dialer.NumberAttributes;

import com.android.dialer.calllog.model.CoalescedRow;

import com.android.dialer.calllogutils.NumberAttributesConverter;

import com.android.dialer.common.Assert;

import com.android.dialer.common.LogUtil;

import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
@@ -33,7 +33,6 @@ import com.android.dialer.common.concurrent.ThreadUtil; 
import com.android.dialer.inject.ApplicationContext;

import com.android.dialer.phonelookup.PhoneLookup;

import com.android.dialer.phonelookup.PhoneLookupInfo;

import com.android.dialer.phonelookup.consolidator.PhoneLookupInfoConsolidator;

import com.android.dialer.phonelookup.database.contract.PhoneLookupHistoryContract;

import com.android.dialer.phonelookup.database.contract.PhoneLookupHistoryContract.PhoneLookupHistory;

import com.google.common.collect.ImmutableMap;
@@ -198,23 +197,8 @@ public final class RealtimeRowProcessor { 


  private CoalescedRow applyPhoneLookupInfoToRow(

      PhoneLookupInfo phoneLookupInfo, CoalescedRow row) {

    PhoneLookupInfoConsolidator phoneLookupInfoConsolidator =

        new PhoneLookupInfoConsolidator(phoneLookupInfo);

    return row.toBuilder()

        .setNumberAttributes(

            // TODO(zachh): Put this in a common location.

            NumberAttributes.newBuilder()

                .setName(phoneLookupInfoConsolidator.getName())

                .setPhotoUri(phoneLookupInfoConsolidator.getPhotoUri())

                .setPhotoId(phoneLookupInfoConsolidator.getPhotoId())

                .setLookupUri(phoneLookupInfoConsolidator.getLookupUri())

                .setNumberTypeLabel(phoneLookupInfoConsolidator.getNumberLabel())

                .setIsBusiness(phoneLookupInfoConsolidator.isBusiness())

                .setIsVoicemail(phoneLookupInfoConsolidator.isVoicemail())

                .setIsBlocked(phoneLookupInfoConsolidator.isBlocked())

                .setIsSpam(phoneLookupInfoConsolidator.isSpam())

                .setCanReportAsInvalidNumber(phoneLookupInfoConsolidator.canReportAsInvalidNumber())

                .build())

        .setNumberAttributes(NumberAttributesConverter.fromPhoneLookupInfo(phoneLookupInfo).build())

        .build();

  }

}