commit d005675218627df53b4e83ac3c5345120b947b0c
author Sai Cheemalapati <saicheems@google.com> Wed Jun 11 00:36:40 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 10 21:32:31 2014 +0000
tree a58a021de7ba506d51e411286d10ce97f4cf3e26
parent f15391dab4e361963eafa41e213c24c1606e56c3
parent 9b26459b36cb60b11ab35f90a3303a2b793ea893

Merge "Match landscape on hold view to mockups."

InCallUI/src/com/android/incallui/StatusBarNotifier.java

diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index b7b36d8..43aaa4a 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -277,7 +277,8 @@
         builder.setContentIntent(inCallPendingIntent);
 
         // Set the intent as a full screen intent as well if a call is incoming
-        if (state == Call.State.INCOMING || state == Call.State.CALL_WAITING) {
+        if ((state == Call.State.INCOMING || state == Call.State.CALL_WAITING) &&
+                !InCallPresenter.getInstance().isShowingInCallUi()) {
             configureFullScreenIntent(builder, inCallPendingIntent, call);
         }