From 7b94d1e8ca0ad2f89a640192e02c5a59ad37f4f2 Mon Sep 17 00:00:00 2001 From: erfanian Date: Wed, 10 Jan 2018 15:08:47 -0800 Subject: Add the boilerplate dagger logic for SpeakEasy. Test: NONE PiperOrigin-RevId: 181524242 Change-Id: If5d3632421722b4da7b64f78d904b58723408b7c --- .../android/dialer/binary/aosp/AospDialerRootComponent.java | 8 +++++--- .../dialer/binary/basecomponent/BaseDialerRootComponent.java | 6 ++++-- .../dialer/binary/google/GoogleStubDialerRootComponent.java | 12 +++++++----- 3 files changed, 16 insertions(+), 10 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 c344fad62..1be675925 100644 --- a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java +++ b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java @@ -34,6 +34,7 @@ import com.android.dialer.storage.StorageModule; import com.android.dialer.strictmode.impl.SystemStrictModeModule; import com.android.incallui.calllocation.stub.StubCallLocationModule; import com.android.incallui.maps.stub.StubMapsModule; +import com.android.incallui.speakeasy.StubSpeakEasyModule; import com.android.voicemail.impl.VoicemailModule; import dagger.Component; import javax.inject.Singleton; @@ -51,15 +52,16 @@ import javax.inject.Singleton; SharedPrefConfigProviderModule.class, SimulatorModule.class, StorageModule.class, - SystemStrictModeModule.class, StubCallLocationModule.class, StubDuoModule.class, StubEnrichedCallModule.class, + StubFeedbackModule.class, StubMapsModule.class, - VoicemailModule.class, StubSimSuggestionModule.class, - StubFeedbackModule.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 20152af03..37e04ac82 100644 --- a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java +++ b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java @@ -35,6 +35,7 @@ import com.android.dialer.storage.StorageComponent; import com.android.dialer.strictmode.StrictModeComponent; import com.android.incallui.calllocation.CallLocationComponent; import com.android.incallui.maps.MapsComponent; +import com.android.incallui.speakeasy.SpeakEasyComponent; import com.android.voicemail.VoicemailComponent; /** @@ -58,7 +59,8 @@ public interface BaseDialerRootComponent PreCallComponent.HasComponent, SimSuggestionComponent.HasComponent, SimulatorComponent.HasComponent, + SpamComponent.HasComponent, + SpeakEasyComponent.HasComponent, StorageComponent.HasComponent, StrictModeComponent.HasComponent, - VoicemailComponent.HasComponent, - SpamComponent.HasComponent {} + VoicemailComponent.HasComponent {} diff --git a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java index b54e06229..d9d0d26f1 100644 --- a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java +++ b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java @@ -34,6 +34,7 @@ import com.android.dialer.storage.StorageModule; import com.android.dialer.strictmode.impl.SystemStrictModeModule; import com.android.incallui.calllocation.impl.CallLocationModule; import com.android.incallui.maps.impl.MapsModule; +import com.android.incallui.speakeasy.StubSpeakEasyModule; import com.android.voicemail.impl.VoicemailModule; import dagger.Component; import javax.inject.Singleton; @@ -49,20 +50,21 @@ import javax.inject.Singleton; CallLogModule.class, ContextModule.class, DialerExecutorModule.class, + MapsModule.class, PhoneLookupModule.class, // TODO(zachh): Module which uses APDL? PhoneNumberGeoUtilModule.class, PreCallModule.class, - StubSimSuggestionModule.class, SharedPrefConfigProviderModule.class, SimulatorModule.class, StorageModule.class, - SystemStrictModeModule.class, - StubEnrichedCallModule.class, - MapsModule.class, - VoicemailModule.class, StubDuoModule.class, + StubEnrichedCallModule.class, StubFeedbackModule.class, + StubSimSuggestionModule.class, StubSpamModule.class, + StubSpeakEasyModule.class, + SystemStrictModeModule.class, + VoicemailModule.class, } ) public interface GoogleStubDialerRootComponent extends BaseDialerRootComponent {} -- cgit v1.2.3