From 71a22dc081e458706f07beb1684087dc4a6aedf5 Mon Sep 17 00:00:00 2001 From: wangqi Date: Mon, 21 May 2018 12:29:32 -0700 Subject: Add promotion module. Refactor Duo disclosure card to general promotion card. Bug: 78905507 Test: unit tests PiperOrigin-RevId: 197436677 Change-Id: I511c39308cadfb96ee4519b71ca29b75d0e6750b --- .../binary/aosp/AospDialerRootComponent.java | 61 +++++++++++----------- .../basecomponent/BaseDialerRootComponent.java | 2 + .../google/GoogleStubDialerRootComponent.java | 61 +++++++++++----------- 3 files changed, 64 insertions(+), 60 deletions(-) (limited to 'java/com/android/dialer/binary') diff --git a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java index 8746b2bf1..e650e77f8 100644 --- a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java +++ b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java @@ -35,6 +35,7 @@ import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule; import com.android.dialer.precall.impl.PreCallModule; import com.android.dialer.preferredsim.PreferredSimModule; import com.android.dialer.preferredsim.suggestion.stub.StubSimSuggestionModule; +import com.android.dialer.promotion.impl.PromotionModule; import com.android.dialer.simulator.impl.SimulatorModule; import com.android.dialer.simulator.stub.StubSimulatorEnrichedCallModule; import com.android.dialer.spam.stub.StubSpamModule; @@ -50,34 +51,34 @@ import javax.inject.Singleton; /** Root component for the AOSP Dialer application. */ @Singleton @Component( - modules = { - ActiveCallsModule.class, - CallLogModule.class, - CallLogConfigModule.class, - CommandLineModule.class, - ContextModule.class, - DialerExecutorModule.class, - GlidePhotoManagerModule.class, - PhoneLookupModule.class, - PhoneNumberGeoUtilModule.class, - PreCallModule.class, - PreferredSimModule.class, - SharedPrefConfigProviderModule.class, - SimulatorModule.class, - StubSimulatorEnrichedCallModule.class, - StorageModule.class, - StubCallLocationModule.class, - StubDuoModule.class, - StubEnrichedCallModule.class, - StubBubbleModule.class, - StubMetricsModule.class, - StubFeedbackModule.class, - StubMapsModule.class, - StubSimSuggestionModule.class, - StubSpamModule.class, - StubSpeakEasyModule.class, - SystemStrictModeModule.class, - VoicemailModule.class, - } -) + modules = { + ActiveCallsModule.class, + CallLogModule.class, + CallLogConfigModule.class, + CommandLineModule.class, + ContextModule.class, + DialerExecutorModule.class, + GlidePhotoManagerModule.class, + PhoneLookupModule.class, + PhoneNumberGeoUtilModule.class, + PreCallModule.class, + PreferredSimModule.class, + PromotionModule.class, + SharedPrefConfigProviderModule.class, + SimulatorModule.class, + StubSimulatorEnrichedCallModule.class, + StorageModule.class, + StubCallLocationModule.class, + StubDuoModule.class, + StubEnrichedCallModule.class, + StubBubbleModule.class, + StubMetricsModule.class, + StubFeedbackModule.class, + StubMapsModule.class, + StubSimSuggestionModule.class, + StubSpamModule.class, + StubSpeakEasyModule.class, + SystemStrictModeModule.class, + VoicemailModule.class, + }) public interface AospDialerRootComponent extends BaseDialerRootComponent {} diff --git a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java index cad2eb7e0..1d346accf 100644 --- a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java +++ b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java @@ -36,6 +36,7 @@ import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtilComponent; import com.android.dialer.precall.PreCallComponent; import com.android.dialer.preferredsim.PreferredSimComponent; import com.android.dialer.preferredsim.suggestion.SimSuggestionComponent; +import com.android.dialer.promotion.PromotionComponent; import com.android.dialer.simulator.SimulatorComponent; import com.android.dialer.spam.SpamComponent; import com.android.dialer.speeddial.loader.UiItemLoaderComponent; @@ -72,6 +73,7 @@ public interface BaseDialerRootComponent PhoneNumberGeoUtilComponent.HasComponent, PreCallComponent.HasComponent, PreferredSimComponent.HasComponent, + PromotionComponent.HasComponent, UiItemLoaderComponent.HasComponent, SimSuggestionComponent.HasComponent, SimulatorComponent.HasComponent, diff --git a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java index 62b8ca251..8c0ac56a2 100644 --- a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java +++ b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java @@ -35,6 +35,7 @@ import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule; import com.android.dialer.precall.impl.PreCallModule; import com.android.dialer.preferredsim.PreferredSimModule; import com.android.dialer.preferredsim.suggestion.stub.StubSimSuggestionModule; +import com.android.dialer.promotion.impl.PromotionModule; import com.android.dialer.simulator.impl.SimulatorModule; import com.android.dialer.simulator.stub.StubSimulatorEnrichedCallModule; import com.android.dialer.spam.stub.StubSpamModule; @@ -53,34 +54,34 @@ import javax.inject.Singleton; */ @Singleton @Component( - modules = { - ActiveCallsModule.class, - CallLocationModule.class, - CallLogModule.class, - CallLogConfigModule.class, - CommandLineModule.class, - ContextModule.class, - DialerExecutorModule.class, - GlidePhotoManagerModule.class, - MapsModule.class, - PhoneLookupModule.class, // TODO(zachh): Module which uses APDL? - PhoneNumberGeoUtilModule.class, - PreCallModule.class, - PreferredSimModule.class, - SharedPrefConfigProviderModule.class, - SimulatorModule.class, - StorageModule.class, - StubSimulatorEnrichedCallModule.class, - StubDuoModule.class, - StubEnrichedCallModule.class, - StubFeedbackModule.class, - StubMetricsModule.class, - StubBubbleModule.class, - StubSimSuggestionModule.class, - StubSpamModule.class, - StubSpeakEasyModule.class, - SystemStrictModeModule.class, - VoicemailModule.class, - } -) + modules = { + ActiveCallsModule.class, + CallLocationModule.class, + CallLogModule.class, + CallLogConfigModule.class, + CommandLineModule.class, + ContextModule.class, + DialerExecutorModule.class, + GlidePhotoManagerModule.class, + MapsModule.class, + PhoneLookupModule.class, // TODO(zachh): Module which uses APDL? + PhoneNumberGeoUtilModule.class, + PreCallModule.class, + PreferredSimModule.class, + PromotionModule.class, + SharedPrefConfigProviderModule.class, + SimulatorModule.class, + StorageModule.class, + StubSimulatorEnrichedCallModule.class, + StubDuoModule.class, + StubEnrichedCallModule.class, + StubFeedbackModule.class, + StubMetricsModule.class, + StubBubbleModule.class, + StubSimSuggestionModule.class, + StubSpamModule.class, + StubSpeakEasyModule.class, + SystemStrictModeModule.class, + VoicemailModule.class, + }) public interface GoogleStubDialerRootComponent extends BaseDialerRootComponent {} -- cgit v1.2.3