Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90e85154 authored by yueg's avatar yueg Committed by android-build-merger
Browse files

Merge "Fix bubble showing after dismiss bug." am: 4db53d0c 

am: 56fbf959

Change-Id: I830e7e62bdcb8c2a911dae89753b818f7e4645b1
parents 302720c9 56fbf959

java/com/android/bubble/Bubble.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,9 @@ public interface Bubble { 
  /** Returns whether the bubble is currently visible */

  /** Returns whether the bubble is currently visible */

  boolean isVisible();

  boolean isVisible();





  /** Returns whether the bubble is currently dismissed */

  boolean isDismissed();



  /**

  /**

   * Set the info for this Bubble to display

   * Set the info for this Bubble to display

   *

   *

java/com/android/bubble/stub/BubbleStub.java

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

    return false;

  }

  }





  @Override

  public boolean isDismissed() {

    return false;

  }



  @Override

  @Override

  public void setBubbleInfo(@NonNull BubbleInfo bubbleInfo) {}

  public void setBubbleInfo(@NonNull BubbleInfo bubbleInfo) {}

java/com/android/incallui/ReturnToCallController.java

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

    endCall = createActionIntent(ReturnToCallActionReceiver.ACTION_END_CALL);

    fullScreen = createActionIntent(ReturnToCallActionReceiver.ACTION_RETURN_TO_CALL);

    fullScreen = createActionIntent(ReturnToCallActionReceiver.ACTION_RETURN_TO_CALL);





    InCallPresenter.getInstance().addInCallUiListener(this);

    CallList.getInstance().addListener(this);

    AudioModeProvider.getInstance().addListener(this);

    AudioModeProvider.getInstance().addListener(this);

    audioState = AudioModeProvider.getInstance().getAudioState();

    audioState = AudioModeProvider.getInstance().getAudioState();

    InCallPresenter.getInstance().addInCallUiListener(this);

    CallList.getInstance().addListener(this);

  }

  }





  public void tearDown() {

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

      return;

    }

    }





    if ((bubble == null || !bubble.isVisible())

    if ((bubble == null || !(bubble.isVisible() || bubble.isDismissed()))

        && getCall() != null

        && getCall() != null

        && !InCallPresenter.getInstance().isShowingInCallUi()) {

        && !InCallPresenter.getInstance().isShowingInCallUi()) {

      LogUtil.i("ReturnToCallController.onCallListChange", "going to show bubble");

      LogUtil.i("ReturnToCallController.onCallListChange", "going to show bubble");