diff options
| author | wangqi <wangqi@google.com> | 2017-06-20 11:23:41 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-06-21 18:16:03 +0000 |
| commit | 5b4becb8ca9cc6249d0cf0a074bf63d6999f3b5e (patch) | |
| tree | 9ced1a3f07598cfb65cc3226368ba5321ee10107 /java/com/android/incallui/VideoCallPresenter.java | |
| parent | f0a8ccfcd370d26b3887fc8428dedf5596f42ca8 (diff) | |
Automated g4 rollback of changelist 158923709.
*** Reason for rollback ***
It's not necessary anymore after we verified it could be controlled from server side.
*** Original change description ***
Flip flag to enable ReturnToCall bubble.
Enables ReturnToCall bubble and changes the name of the flag so that it can be toggled independently from previous versions.
***
Also in the change: Restore TODOs
Test: TH
PiperOrigin-RevId: 159587541
Change-Id: I88f01550f07a7859f41b4f0fc843e92b38f5a85b
Diffstat (limited to 'java/com/android/incallui/VideoCallPresenter.java')
| -rw-r--r-- | java/com/android/incallui/VideoCallPresenter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/incallui/VideoCallPresenter.java b/java/com/android/incallui/VideoCallPresenter.java index bd9837097..70f95e082 100644 --- a/java/com/android/incallui/VideoCallPresenter.java +++ b/java/com/android/incallui/VideoCallPresenter.java @@ -761,7 +761,7 @@ public class VideoCallPresenter /** * Adjusts the current video mode by setting up the preview and display surfaces as necessary. * Expected to be called whenever the video state associated with a call changes (e.g. a user - * turns their camera on or off) to ensure the correct surfaces are shown/hidden. TODO: Need + * turns their camera on or off) to ensure the correct surfaces are shown/hidden. TODO(vt): Need * to adjust size and orientation of preview surface here. */ private void adjustVideoMode(DialerCall call) { @@ -843,7 +843,7 @@ public class VideoCallPresenter if (!hasCameraPermission) { videoCall.setCamera(null); mPreviewSurfaceState = PreviewSurfaceState.NONE; - // TODO: Inform remote party that the video is off. This is similar to b/30256571. + // TODO(wangqi): Inform remote party that the video is off. This is similar to b/30256571. } else if (isCameraRequired) { InCallCameraManager cameraManager = InCallPresenter.getInstance().getInCallCameraManager(); videoCall.setCamera(cameraManager.getActiveCameraId()); |