Merge "IMS-VT: Auto fullscreen issues during UI rotation." into atel.lnx.2.0-dev
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index 3956f04..dd2af36 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -214,6 +214,10 @@
// TODO(klp): Do we need to add this back when prox sensor is not available?
// lp.inputFeatures |= WindowManager.LayoutParams.INPUT_FEATURE_DISABLE_USER_ACTIVITY;
+ // Since activity is created newly, clear full screen flag. This will ensure that
+ // the flag is in sync with actual UI when UI is recreated due to orientation change.
+ InCallPresenter.getInstance().clearFullscreen();
+
setContentView(R.layout.incall_screen);
internalResolveIntent(getIntent());
diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
index e08f4d5..9b72c17 100644
--- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
@@ -322,6 +322,7 @@
CallList.getInstance().removeCallUpdateListener(mPrimaryCall.getId(), this);
}
mPictureModeHelper.tearDown(this);
+ cancelAutoFullScreen();
}
/**
@@ -1290,6 +1291,9 @@
}
Log.v(this, "cancelAutoFullScreen : cancelling pending");
mAutoFullScreenPending = false;
+ if (mHandler != null) {
+ mHandler.removeCallbacks(mAutoFullscreenRunnable);
+ }
}
private static boolean isAudioRouteEnabled(int audioRoute, int audioRouteMask) {