From af719e9e11aebf649d01651ed1960c6db9c1f2ef Mon Sep 17 00:00:00 2001
From: Zachary Heidepriem <zachh@google.com>
Date: Wed, 1 Nov 2017 12:24:16 -0700
Subject: Added CompositePhoneLookup and added and implemented "lookup" method.

Fleshed out docs for PhoneLookup.

Added dagger components and modules.

Bug: 34672501
Test: unit
PiperOrigin-RevId: 173977963
Change-Id: If07795d9d3d56a59afd27cdda3e98543bf30fdb8
---
 java/com/android/dialer/binary/aosp/AospDialerRootComponent.java  | 6 ++++--
 .../dialer/binary/basecomponent/BaseDialerRootComponent.java      | 8 +++++---
 .../dialer/binary/google/GoogleStubDialerRootComponent.java       | 2 ++
 3 files changed, 11 insertions(+), 5 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 3edc73cfe..bd275df55 100644
--- a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
+++ b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
@@ -23,6 +23,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.inject.ContextModule;
+import com.android.dialer.phonelookup.PhoneLookupModule;
 import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule;
 import com.android.dialer.simulator.impl.SimulatorModule;
 import com.android.dialer.storage.StorageModule;
@@ -40,16 +41,17 @@ import javax.inject.Singleton;
     CallLogModule.class,
     ContextModule.class,
     DialerExecutorModule.class,
+    PhoneLookupModule.class,
     PhoneNumberGeoUtilModule.class,
     SharedPrefConfigProviderModule.class,
     SimulatorModule.class,
     StorageModule.class,
     SystemStrictModeModule.class,
     StubCallLocationModule.class,
+    StubDuoModule.class,
     StubEnrichedCallModule.class,
     StubMapsModule.class,
-    VoicemailModule.class,
-    StubDuoModule.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 c3ca56511..bc5036ff1 100644
--- a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java
+++ b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java
@@ -23,6 +23,7 @@ import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.duo.DuoComponent;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.main.MainComponent;
+import com.android.dialer.phonelookup.PhoneLookupComponent;
 import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtilComponent;
 import com.android.dialer.simulator.SimulatorComponent;
 import com.android.dialer.storage.StorageComponent;
@@ -41,12 +42,13 @@ public interface BaseDialerRootComponent
         CallLogDatabaseComponent.HasComponent,
         ConfigProviderComponent.HasComponent,
         DialerExecutorComponent.HasComponent,
-        MainComponent.HasComponent,
+        DuoComponent.HasComponent,
         EnrichedCallComponent.HasComponent,
+        MainComponent.HasComponent,
         MapsComponent.HasComponent,
+        PhoneLookupComponent.HasComponent,
         PhoneNumberGeoUtilComponent.HasComponent,
         SimulatorComponent.HasComponent,
         StorageComponent.HasComponent,
         StrictModeComponent.HasComponent,
-        VoicemailComponent.HasComponent,
-        DuoComponent.HasComponent {}
+        VoicemailComponent.HasComponent {}
diff --git a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java
index dc8d56316..c47a69bbd 100644
--- a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java
+++ b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java
@@ -23,6 +23,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.inject.ContextModule;
+import com.android.dialer.phonelookup.PhoneLookupModule;
 import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule;
 import com.android.dialer.simulator.impl.SimulatorModule;
 import com.android.dialer.storage.StorageModule;
@@ -44,6 +45,7 @@ import javax.inject.Singleton;
     CallLogModule.class,
     ContextModule.class,
     DialerExecutorModule.class,
+    PhoneLookupModule.class, // TODO(zachh): Module which uses APDL?
     PhoneNumberGeoUtilModule.class,
     SharedPrefConfigProviderModule.class,
     SimulatorModule.class,
-- 
cgit v1.2.3