diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-10 02:23:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-10 02:23:46 +0000 |
| commit | d5514615336a16a83b885c4c18bcbcddccdf9407 (patch) | |
| tree | fb855d25b3e7ea777beaa7de19ab729c977ef0e5 /java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java | |
| parent | 4093c4fcbb9fb519c90eac618ed6d6fe0fdd4cec (diff) | |
| parent | 48f93f40f66f5695cdb370af679db4580cebb641 (diff) | |
Merge changes Ieab3ee3f,I4b917d8a
* changes:
Remove bubble "new" prefix.
Dismiss keyboard when opening overflow menu in RTT call.
Diffstat (limited to 'java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java')
| -rw-r--r-- | java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java index 497d97724..f9f561a0e 100644 --- a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java +++ b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java @@ -16,6 +16,7 @@ package com.android.dialer.binary.google; +import com.android.bubble.stub.StubBubbleModule; import com.android.dialer.binary.basecomponent.BaseDialerRootComponent; import com.android.dialer.calllog.CallLogModule; import com.android.dialer.commandline.CommandLineModule; @@ -39,7 +40,6 @@ 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; @@ -69,7 +69,7 @@ import javax.inject.Singleton; StubEnrichedCallModule.class, StubFeedbackModule.class, StubMetricsModule.class, - StubNewBubbleModule.class, + StubBubbleModule.class, StubSimSuggestionModule.class, StubSpamModule.class, StubSpeakEasyModule.class, |