From 3bcea98f1e6d63e22a7b5393b31c2195d3db82b4 Mon Sep 17 00:00:00 2001 From: sail Date: Sun, 3 Sep 2017 13:57:22 -0700 Subject: Switch Dialer to use new third_party bubble library This CL switches Dialer to use the new common bubble libary. It also moves the integration tests into the bubble libary. Bug: 64797730 Test: BubbleIntegrationTest PiperOrigin-RevId: 167439680 Change-Id: Ie2e9367cb6a6561efb8abd425b6a12f8c1e78138 --- java/com/android/incallui/ReturnToCallController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'java/com/android/incallui') diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java index e54102ca8..fd48b37e1 100644 --- a/java/com/android/incallui/ReturnToCallController.java +++ b/java/com/android/incallui/ReturnToCallController.java @@ -23,16 +23,16 @@ import android.graphics.drawable.Icon; import android.support.annotation.NonNull; import android.support.annotation.VisibleForTesting; import android.telecom.CallAudioState; +import com.android.bubble.Bubble; +import com.android.bubble.Bubble.BubbleExpansionStateListener; +import com.android.bubble.Bubble.ExpansionState; +import com.android.bubble.BubbleInfo; +import com.android.bubble.BubbleInfo.Action; import com.android.dialer.common.LogUtil; import com.android.dialer.configprovider.ConfigProviderBindings; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.telecom.TelecomUtil; -import com.android.dialershared.bubble.Bubble; -import com.android.dialershared.bubble.Bubble.BubbleExpansionStateListener; -import com.android.dialershared.bubble.Bubble.ExpansionState; -import com.android.dialershared.bubble.BubbleInfo; -import com.android.dialershared.bubble.BubbleInfo.Action; import com.android.incallui.InCallPresenter.InCallUiListener; import com.android.incallui.audiomode.AudioModeProvider; import com.android.incallui.audiomode.AudioModeProvider.AudioModeListener; -- cgit v1.2.3