From 7b28abc0f919395a971f48d8add255e1a0303ec2 Mon Sep 17 00:00:00 2001
From: yueg <yueg@google.com>
Date: Thu, 21 Sep 2017 16:08:30 -0700
Subject: Don't show bubble when InCallActivity is visible in multi screen
 mode.

By moving InCallPresenter.onUiShowing() from InCallActivityCommon.onResume/onPause to onStart/onStop.

Test: manual
PiperOrigin-RevId: 169615685
Change-Id: I146a5d87028040b0f5e587b8163f29d55b9e7ff7
---
 java/com/android/incallui/InCallActivityCommon.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'java')

diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java
index 14531e0ee..fec9700ab 100644
--- a/java/com/android/incallui/InCallActivityCommon.java
+++ b/java/com/android/incallui/InCallActivityCommon.java
@@ -263,6 +263,9 @@ public class InCallActivityCommon {
             == InCallOrientationEventListener.ACTIVITY_PREFERENCE_ALLOW_ROTATION);
 
     InCallPresenter.getInstance().onActivityStarted();
+    if (!isRecreating) {
+      InCallPresenter.getInstance().onUiShowing(true);
+    }
   }
 
   public void onResume() {
@@ -272,7 +275,6 @@ public class InCallActivityCommon {
           "InCallPresenter is ready for tear down, not sending updates");
     } else {
       updateTaskDescription();
-      InCallPresenter.getInstance().onUiShowing(true);
     }
 
     // If there is a pending request to show or hide the dialpad, handle that now.
@@ -316,7 +318,6 @@ public class InCallActivityCommon {
       dialpadFragment.onDialerKeyUp(null);
     }
 
-    InCallPresenter.getInstance().onUiShowing(false);
     if (inCallActivity.isFinishing()) {
       InCallPresenter.getInstance().unsetActivity(inCallActivity);
     }
@@ -338,6 +339,9 @@ public class InCallActivityCommon {
     enableInCallOrientationEventListener(false);
     InCallPresenter.getInstance().updateIsChangingConfigurations();
     InCallPresenter.getInstance().onActivityStopped();
+    if (!isRecreating) {
+      InCallPresenter.getInstance().onUiShowing(false);
+    }
   }
 
   public void onDestroy() {
-- 
cgit v1.2.3