Merge "IMS-VT: Hide preview video when in VT conference call." into atel.lnx.2.0-dev (3b175a1b) · Commits · e / os / android_packages_apps_Dialer

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -806,6 +806,13 @@ public class VideoCallFragment extends BaseFragment<VideoCallPresenter,
		return sPreviewSurface.getSurfaceDimensions();
		}

		@Override
		public void showOutgoingVideoView(boolean show) {
		if (mPreviewVideoContainer != null) {
		mPreviewVideoContainer.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
		}
		}

		/**
		* Inflates the {@link ViewStub} containing the incoming and outgoing surfaces, if necessary,
		* and creates {@link VideoCallSurface} instances to track the surfaces.

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

+25 −6

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@ import android.telecom.VideoProfile.CameraCapabilities;
		import android.view.Surface;
		import android.widget.ImageView;

		import org.codeaurora.ims.utils.QtiImsExtUtils;

		import com.android.contacts.common.ContactPhotoManager;
		import com.android.contacts.common.compat.CompatUtils;
		import com.android.dialer.R;
		@@ -324,7 +326,9 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
		// whether PLAYER_START event has been received or not. Since we
		// start with showing incoming video by default for surface creation,
		// we need to make sure we hide it once surface is available.
		showVideoUi(mCurrentVideoState, mCurrentCallState);
		boolean isConf = (mPrimaryCall != null ? mPrimaryCall.isConferenceCall() :
		false);
		showVideoUi(mCurrentVideoState, mCurrentCallState, isConf);
		}
		}

		@@ -566,7 +570,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
		}

		// Make sure we hide or show the video UI if needed.
		showVideoUi(call.getVideoState(), call.getState());
		showVideoUi(call.getVideoState(), call.getState(), call.isConferenceCall());
		}

		private void cleanupSurfaces() {
		@@ -725,7 +729,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
		return;
		}

		showVideoUi(newVideoState, call.getState());
		showVideoUi(newVideoState, call.getState(), call.isConferenceCall());

		// Communicate the current camera to telephony and make a request for the camera
		// capabilities.
		@@ -773,7 +777,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
		private void exitVideoMode() {
		Log.d(this, "exitVideoMode");

		showVideoUi(VideoProfile.STATE_AUDIO_ONLY, Call.State.ACTIVE);
		showVideoUi(VideoProfile.STATE_AUDIO_ONLY, Call.State.ACTIVE, false);
		enableCamera(mVideoCall, false);
		InCallPresenter.getInstance().setFullScreen(false);

		@@ -791,7 +795,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
		* @param videoState The video state.
		* @param callState The call state.
		*/
		private void showVideoUi(int videoState, int callState) {
		private void showVideoUi(int videoState, int callState, boolean isConf) {
		VideoCallUi ui = getUi();
		if (ui == null) {
		Log.e(this, "showVideoUi, VideoCallUi is null returning");
		@@ -809,6 +813,10 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
		if (showIncomingVideo \|\| showOutgoingVideo) {
		ui.showVideoViews(showOutgoingVideo, showIncomingVideo);

		boolean hidePreview = shallHidePreview(isConf, videoState);
		Log.v(this, "showVideoUi, hidePreview = " + hidePreview);
		ui.showOutgoingVideoView(!hidePreview);

		if (isVideoReceptionEnabled) {
		loadProfilePhotoAsync();
		}
		@@ -1023,7 +1031,9 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
		case Connection.VideoProvider.SESSION_EVENT_RX_RESUME:
		mIsIncomingVideoAvailable =
		event == Connection.VideoProvider.SESSION_EVENT_RX_RESUME;
		showVideoUi(mCurrentVideoState, mCurrentCallState);
		boolean isConf = (mPrimaryCall != null ? mPrimaryCall.isConferenceCall() :
		false);
		showVideoUi(mCurrentVideoState, mCurrentCallState, isConf);
		sb.append(mIsIncomingVideoAvailable ? "rx_resume" : "rx_pause");
		break;
		case Connection.VideoProvider.SESSION_EVENT_CAMERA_FAILURE:
		@@ -1364,6 +1374,14 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
		task.execute();
		}

		/**
		* Hide preview window if it is a VT conference call
		*/
		private boolean shallHidePreview(boolean isConf, int videoState) {
		return VideoProfile.isBidirectional(videoState) && isConf
		&& QtiImsExtUtils.shallHidePreviewInVtConference(mContext);
		}

		/**
		* Defines the VideoCallUI interactions.
		*/
		@@ -1384,5 +1402,6 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
		ImageView getPreviewPhotoView();
		void adjustPreviewLocation(boolean shiftUp, int offset);
		void setPreviewRotation(int orientation);
		void showOutgoingVideoView(boolean show);
		}
		}