Merge "Fix bubble showing after dismiss bug." (56fbf959) · Commits · e / os / android_packages_apps_Dialer

java/com/android/bubble/Bubble.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,9 @@ public interface Bubble {
		/** Returns whether the bubble is currently visible */
		boolean isVisible();

		/** Returns whether the bubble is currently dismissed */
		boolean isDismissed();

		/**
		* Set the info for this Bubble to display
		*

+5 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,11 @@ public class BubbleStub implements Bubble {
		return false;
		}

		@Override
		public boolean isDismissed() {
		return false;
		}

		@Override
		public void setBubbleInfo(@NonNull BubbleInfo bubbleInfo) {}

+3 −3

Original line number	Diff line number	Diff line
		@@ -92,10 +92,10 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio
		endCall = createActionIntent(ReturnToCallActionReceiver.ACTION_END_CALL);
		fullScreen = createActionIntent(ReturnToCallActionReceiver.ACTION_RETURN_TO_CALL);

		InCallPresenter.getInstance().addInCallUiListener(this);
		CallList.getInstance().addListener(this);
		AudioModeProvider.getInstance().addListener(this);
		audioState = AudioModeProvider.getInstance().getAudioState();
		InCallPresenter.getInstance().addInCallUiListener(this);
		CallList.getInstance().addListener(this);
		}

		public void tearDown() {
		@@ -186,7 +186,7 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio
		return;
		}

		if ((bubble == null \|\| !bubble.isVisible())
		if ((bubble == null \|\| !(bubble.isVisible() \|\| bubble.isDismissed()))
		&& getCall() != null
		&& !InCallPresenter.getInstance().isShowingInCallUi()) {
		LogUtil.i("ReturnToCallController.onCallListChange", "going to show bubble");