From b6e16f578629eee53457a3fc17778f2252102891 Mon Sep 17 00:00:00 2001
From: yueg <yueg@google.com>
Date: Wed, 31 Jan 2018 12:02:19 -0800
Subject: Remove bubble from AOSP.

Bug: 67605985
Test: NewBubbleImplTest, NewBubbleImplIntegrationTest, NewReturnToCallControllerTest
PiperOrigin-RevId: 184026033
Change-Id: Ie141ce9a0265ce3a08c01943cdeb94e2cd962e9f
---
 java/com/android/dialer/binary/aosp/AospDialerRootComponent.java        | 2 ++
 .../android/dialer/binary/basecomponent/BaseDialerRootComponent.java    | 2 ++
 .../com/android/dialer/binary/google/GoogleStubDialerRootComponent.java | 2 ++
 3 files changed, 6 insertions(+)

(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 7d277d4b3..3f90e6a9e 100644
--- a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
+++ b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
@@ -37,6 +37,7 @@ 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.newbubble.stub.StubNewBubbleModule;
 import com.android.voicemail.impl.VoicemailModule;
 import dagger.Component;
 import javax.inject.Singleton;
@@ -59,6 +60,7 @@ import javax.inject.Singleton;
     StubCallLocationModule.class,
     StubDuoModule.class,
     StubEnrichedCallModule.class,
+    StubNewBubbleModule.class,
     StubFeedbackModule.class,
     StubMapsModule.class,
     StubSimSuggestionModule.class,
diff --git a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java
index 7e61af4c7..d8efd0a07 100644
--- a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java
+++ b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java
@@ -37,6 +37,7 @@ 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.newbubble.NewBubbleComponent;
 import com.android.voicemail.VoicemailComponent;
 
 /**
@@ -56,6 +57,7 @@ public interface BaseDialerRootComponent
         FeedbackComponent.HasComponent,
         MainComponent.HasComponent,
         MapsComponent.HasComponent,
+        NewBubbleComponent.HasComponent,
         PhoneLookupComponent.HasComponent,
         PhoneNumberGeoUtilComponent.HasComponent,
         PreCallComponent.HasComponent,
diff --git a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java
index ff1b09db7..4da0f92f4 100644
--- a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java
+++ b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java
@@ -37,6 +37,7 @@ 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.newbubble.stub.StubNewBubbleModule;
 import com.android.voicemail.impl.VoicemailModule;
 import dagger.Component;
 import javax.inject.Singleton;
@@ -64,6 +65,7 @@ import javax.inject.Singleton;
     StubDuoModule.class,
     StubEnrichedCallModule.class,
     StubFeedbackModule.class,
+    StubNewBubbleModule.class,
     StubSimSuggestionModule.class,
     StubSpamModule.class,
     StubSpeakEasyModule.class,
-- 
cgit v1.2.3