am 757f6653: Merge "only disable the system bars when inCallActivity is visible"

* commit '757f6653ce8686f5e853aa52bef7c77f6f110536':
  only disable the system bars when inCallActivity is visible

1 files changed, 3 insertions, 5 deletions

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 5551eb869..6260e9547 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -264,11 +264,6 @@ public class InCallPresenter implements CallList.Listener {
         Log.i(this, "Phone switching state: " + mInCallState + " -> " + newState);
         mInCallState = newState;
 
-        // Disable notification shade and soft navigation buttons
-        if (newState.isIncoming()) {
-            CallCommandClient.getInstance().setSystemBarNavigationEnabled(false);
-        }
-
         for (IncomingCallListener listener : mIncomingCallListeners) {
             listener.onIncomingCall(mInCallState, call);
         }
@@ -411,6 +406,9 @@ public class InCallPresenter implements CallList.Listener {
         if (showing) {
             mIsActivityPreviouslyStarted = true;
         }
+
+        final boolean shouldLockBars = showing && mInCallState.isIncoming();
+        CallCommandClient.getInstance().setSystemBarNavigationEnabled(!shouldLockBars);
     }
 
     /**