DO NOT MERGE More video related API fixes

android.telecom.Connection.VideoProvider
* onSetPauseImage takes Uri instead of String
* changeCallDataUsage -> setCallDataUsage
* add quality constants to changeVideoQuality() docs

android.telecom.InCallService.VideoCall
* setPauseImage takes Uri instea dof String

android.telecom.VideoProfile.VideoState
* Move constants to VideoProfile, prefix with STATE_

Bug: 21040387
Bug: 21066505
Change-Id: I764e72aced9d1e2d30d6d0cf0862100860d47c79

9 files changed, 18 insertions, 18 deletions

diff --git a/InCallUI/src/com/android/incallui/AnswerFragment.java b/InCallUI/src/com/android/incallui/AnswerFragment.java
index b6ac7ba59..a16b442d5 100644
--- a/InCallUI/src/com/android/incallui/AnswerFragment.java
+++ b/InCallUI/src/com/android/incallui/AnswerFragment.java
@@ -125,7 +125,7 @@ public class AnswerFragment extends BaseFragment<AnswerPresenter, AnswerPresente
      * @param targetSet Integer identifying the set of targets to use.
      */
     public void showTargets(int targetSet) {
-        showTargets(targetSet, VideoProfile.VideoState.BIDIRECTIONAL);
+        showTargets(targetSet, VideoProfile.STATE_BIDIRECTIONAL);
     }
 
     /**
diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java
index 605d1a182..9884b274f 100644
--- a/InCallUI/src/com/android/incallui/Call.java
+++ b/InCallUI/src/com/android/incallui/Call.java
@@ -246,7 +246,7 @@ public final class Call {
     /**
      * mModifyToVideoState is used to store requested upgrade / downgrade video state
      */
-    private int mModifyToVideoState = VideoProfile.VideoState.AUDIO_ONLY;
+    private int mModifyToVideoState = VideoProfile.STATE_AUDIO_ONLY;
 
     private InCallVideoCallCallback mVideoCallCallback;
 
diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
index f9060a60a..4fc60cac8 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -250,7 +250,7 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
         }
 
         VideoProfile videoProfile = new VideoProfile(
-                VideoProfile.VideoState.AUDIO_ONLY, VideoProfile.QUALITY_DEFAULT);
+                VideoProfile.STATE_AUDIO_ONLY, VideoProfile.QUALITY_DEFAULT);
         videoCall.sendSessionModifyRequest(videoProfile);
     }
 
@@ -266,7 +266,7 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
         }
         int currVideoState = mCall.getVideoState();
         int currUnpausedVideoState = CallUtils.getUnPausedVideoState(currVideoState);
-        currUnpausedVideoState |= VideoProfile.VideoState.BIDIRECTIONAL;
+        currUnpausedVideoState |= VideoProfile.STATE_BIDIRECTIONAL;
 
         VideoProfile videoProfile = new VideoProfile(currUnpausedVideoState);
         videoCall.sendSessionModifyRequest(videoProfile);
@@ -313,14 +313,14 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
         if (pause) {
             videoCall.setCamera(null);
             VideoProfile videoProfile = new VideoProfile(
-                    mCall.getVideoState() & ~VideoProfile.VideoState.TX_ENABLED);
+                    mCall.getVideoState() & ~VideoProfile.STATE_TX_ENABLED);
             videoCall.sendSessionModifyRequest(videoProfile);
         } else {
             InCallCameraManager cameraManager = InCallPresenter.getInstance().
                     getInCallCameraManager();
             videoCall.setCamera(cameraManager.getActiveCameraId());
             VideoProfile videoProfile = new VideoProfile(
-                    mCall.getVideoState() | VideoProfile.VideoState.TX_ENABLED);
+                    mCall.getVideoState() | VideoProfile.STATE_TX_ENABLED);
             videoCall.sendSessionModifyRequest(videoProfile);
             mCall.setSessionModificationState(Call.SessionModificationState.WAITING_FOR_RESPONSE);
         }
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index fcbe16794..c4dbcbe78 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -249,7 +249,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
         } else {
             getUi().setCallState(
                     callState,
-                    VideoProfile.VideoState.AUDIO_ONLY,
+                    VideoProfile.STATE_AUDIO_ONLY,
                     Call.SessionModificationState.NO_REQUEST,
                     new DisconnectCause(DisconnectCause.UNKNOWN),
                     null,
diff --git a/InCallUI/src/com/android/incallui/CallUtils.java b/InCallUI/src/com/android/incallui/CallUtils.java
index 0e0c4c6f5..7705232c4 100644
--- a/InCallUI/src/com/android/incallui/CallUtils.java
+++ b/InCallUI/src/com/android/incallui/CallUtils.java
@@ -85,11 +85,11 @@ public class CallUtils {
     }
 
     public static int getUnPausedVideoState(int videoState) {
-        return videoState & (~VideoProfile.VideoState.PAUSED);
+        return videoState & (~VideoProfile.STATE_PAUSED);
     }
 
     public static int getPausedVideoState(int videoState) {
-        return videoState | VideoProfile.VideoState.PAUSED;
+        return videoState | VideoProfile.STATE_PAUSED;
     }
 
 }
diff --git a/InCallUI/src/com/android/incallui/GlowPadWrapper.java b/InCallUI/src/com/android/incallui/GlowPadWrapper.java
index 177669668..ea5fc9223 100644
--- a/InCallUI/src/com/android/incallui/GlowPadWrapper.java
+++ b/InCallUI/src/com/android/incallui/GlowPadWrapper.java
@@ -49,7 +49,7 @@ public class GlowPadWrapper extends GlowPadView implements GlowPadView.OnTrigger
     private AnswerListener mAnswerListener;
     private boolean mPingEnabled = true;
     private boolean mTargetTriggered = false;
-    private int mVideoState = VideoProfile.VideoState.BIDIRECTIONAL;
+    private int mVideoState = VideoProfile.STATE_BIDIRECTIONAL;
 
     public GlowPadWrapper(Context context) {
         super(context);
@@ -113,7 +113,7 @@ public class GlowPadWrapper extends GlowPadView implements GlowPadView.OnTrigger
         final int resId = getResourceIdForTarget(target);
         switch (resId) {
             case R.drawable.ic_lockscreen_answer:
-                mAnswerListener.onAnswer(VideoProfile.VideoState.AUDIO_ONLY, getContext());
+                mAnswerListener.onAnswer(VideoProfile.STATE_AUDIO_ONLY, getContext());
                 mTargetTriggered = true;
                 break;
             case R.drawable.ic_lockscreen_decline:
diff --git a/InCallUI/src/com/android/incallui/InCallApp.java b/InCallUI/src/com/android/incallui/InCallApp.java
index a273d7805..d5b6fb922 100644
--- a/InCallUI/src/com/android/incallui/InCallApp.java
+++ b/InCallUI/src/com/android/incallui/InCallApp.java
@@ -72,10 +72,10 @@ public class InCallApp extends Application {
             // TODO: Commands of this nature should exist in the CallList.
             if (action.equals(ACTION_ANSWER_VIDEO_INCOMING_CALL)) {
                 InCallPresenter.getInstance().answerIncomingCall(
-                        context, VideoProfile.VideoState.BIDIRECTIONAL);
+                        context, VideoProfile.STATE_BIDIRECTIONAL);
             } else if (action.equals(ACTION_ANSWER_VOICE_INCOMING_CALL)) {
                 InCallPresenter.getInstance().answerIncomingCall(
-                        context, VideoProfile.VideoState.AUDIO_ONLY);
+                        context, VideoProfile.STATE_AUDIO_ONLY);
             } else if (action.equals(ACTION_DECLINE_INCOMING_CALL)) {
                 InCallPresenter.getInstance().declineIncomingCall(context);
             } else if (action.equals(ACTION_HANG_UP_ONGOING_CALL)) {
@@ -83,7 +83,7 @@ public class InCallApp extends Application {
             } else if (action.equals(ACTION_ACCEPT_VIDEO_UPGRADE_REQUEST)) {
                 //TODO: Change calltype after adding support for TX and RX
                 InCallPresenter.getInstance().acceptUpgradeRequest(
-                        VideoProfile.VideoState.BIDIRECTIONAL, context);
+                        VideoProfile.STATE_BIDIRECTIONAL, context);
             } else if (action.equals(ACTION_DECLINE_VIDEO_UPGRADE_REQUEST)) {
                 InCallPresenter.getInstance().declineUpgradeRequest(context);
             }
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index d48c27e1d..4b8b56d47 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -834,7 +834,7 @@ public class InCallPresenter implements CallList.Listener {
         // (1) Attempt to answer a call
         if (incomingCall != null) {
             TelecomAdapter.getInstance().answerCall(
-                    incomingCall.getId(), VideoProfile.VideoState.AUDIO_ONLY);
+                    incomingCall.getId(), VideoProfile.STATE_AUDIO_ONLY);
             return true;
         }
 
diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
index e97e219e6..b916e04f7 100644
--- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
@@ -243,7 +243,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
         InCallVideoCallCallbackNotifier.getInstance().addSurfaceChangeListener(this);
         InCallVideoCallCallbackNotifier.getInstance().addVideoEventListener(this);
         InCallVideoCallCallbackNotifier.getInstance().addSessionModificationListener(this);
-        mCurrentVideoState = VideoProfile.VideoState.AUDIO_ONLY;
+        mCurrentVideoState = VideoProfile.STATE_AUDIO_ONLY;
         mCurrentCallState = Call.State.INVALID;
     }
 
@@ -549,7 +549,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
 
     private void updateCallCache(Call call) {
         if (call == null) {
-            mCurrentVideoState = VideoProfile.VideoState.AUDIO_ONLY;
+            mCurrentVideoState = VideoProfile.STATE_AUDIO_ONLY;
             mCurrentCallState = Call.State.INVALID;
             mVideoCall = null;
             mPrimaryCall = null;
@@ -750,7 +750,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
     private void exitVideoMode() {
         Log.d(this, "exitVideoMode");
 
-        showVideoUi(VideoProfile.VideoState.AUDIO_ONLY, Call.State.ACTIVE);
+        showVideoUi(VideoProfile.STATE_AUDIO_ONLY, Call.State.ACTIVE);
         enableCamera(mVideoCall, false);
         InCallPresenter.getInstance().setFullScreen(false);