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

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

Merge "Show icon and label for a spam number in the new call log."

parents d4264575 21b13e29

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

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.dialer.configprovider.SharedPrefConfigProviderModule; 
import com.android.dialer.duo.stub.StubDuoModule;

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.phonelookup.PhoneLookupModule;

import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule;
@@ -50,6 +51,7 @@ import javax.inject.Singleton; 
    CommandLineModule.class,

    ContextModule.class,

    DialerExecutorModule.class,

    GlidePhotoManagerModule.class,

    PhoneLookupModule.class,

    PhoneNumberGeoUtilModule.class,

    PreCallModule.class,

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

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.dialer.configprovider.ConfigProviderComponent; 
import com.android.dialer.duo.DuoComponent;

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.phonelookup.PhoneLookupComponent;

import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtilComponent;
@@ -55,6 +56,7 @@ public interface BaseDialerRootComponent 
        DuoComponent.HasComponent,

        EnrichedCallComponent.HasComponent,

        FeedbackComponent.HasComponent,

        GlidePhotoManagerComponent.HasComponent,

        MainComponent.HasComponent,

        MapsComponent.HasComponent,

        NewBubbleComponent.HasComponent,

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

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.dialer.configprovider.SharedPrefConfigProviderModule; 
import com.android.dialer.duo.stub.StubDuoModule;

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.phonelookup.PhoneLookupModule;

import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule;
@@ -54,6 +55,7 @@ import javax.inject.Singleton; 
    CommandLineModule.class,

    ContextModule.class,

    DialerExecutorModule.class,

    GlidePhotoManagerModule.class,

    MapsModule.class,

    PhoneLookupModule.class, // TODO(zachh): Module which uses APDL?

    PhoneNumberGeoUtilModule.class,

java/com/android/dialer/calllog/database/contract/number_attributes.proto

+5 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ option optimize_for = LITE_RUNTIME; 
package com.android.dialer;



// Information related to the phone number of the call.

// Next ID: 12

message NumberAttributes {

  // The name (which may be a person's name or business name, but not a number)

  // formatted exactly as it should appear to the user. If the user's locale or
@@ -59,6 +60,9 @@ message NumberAttributes { 
  // display time.

  optional bool is_cp2_info_incomplete = 9;



  // The number is blocked.

  // Whether the number is blocked.

  optional bool is_blocked = 10;



  // Whether the number is spam.

  optional bool is_spam = 11;

}
 
 No newline at end of file

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

+1 −0
Original line number Diff line number Diff line
@@ -586,6 +586,7 @@ public final class PhoneLookupDataSource 
            .setIsBusiness(phoneLookupInfoConsolidator.isBusiness())

            .setIsVoicemail(phoneLookupInfoConsolidator.isVoicemail())

            .setIsBlocked(phoneLookupInfoConsolidator.isBlocked())

            .setIsSpam(phoneLookupInfoConsolidator.isSpam())

            .setCanReportAsInvalidNumber(phoneLookupInfoConsolidator.canReportAsInvalidNumber())

            .setIsCp2InfoIncomplete(phoneLookupInfoConsolidator.isCp2LocalInfoIncomplete())

            .build()