diff options
author | Andrew Lee <anwlee@google.com> | 2015-04-15 14:13:32 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2015-04-16 17:21:53 -0700 |
commit | cc30bc033063aa1a2e027db6be8731cfa8476d88 (patch) | |
tree | c42f08846a1be0447eea48b158ca0cc337975494 /InCallUI | |
parent | ab97cf2b6de2226001c393891bf123544cb6f8bd (diff) |
DO NOT MERGE Rename CallListener to CallCallback.
To match API changes.
Plus, random fixes because of master being out of sync with MW.
Bug: 20160491
Change-Id: I664cb0c3db7e0affc42179d467828246887069e8
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/Call.java | 30 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallList.java | 2 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 15 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallVideoCallCallback.java (renamed from InCallUI/src/com/android/incallui/InCallVideoCallListener.java) | 32 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallVideoCallCallbackNotifier.java (renamed from InCallUI/src/com/android/incallui/InCallVideoCallListenerNotifier.java) | 11 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/VideoCallPresenter.java | 18 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/VideoPauseController.java | 6 |
7 files changed, 56 insertions, 58 deletions
diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java index a3fcd4db7..254460d76 100644 --- a/InCallUI/src/com/android/incallui/Call.java +++ b/InCallUI/src/com/android/incallui/Call.java @@ -168,11 +168,11 @@ public final class Call { private static final String ID_PREFIX = Call.class.getSimpleName() + "_"; private static int sIdCounter = 0; - private android.telecom.Call.Listener mTelecommCallListener = - new android.telecom.Call.Listener() { + private android.telecom.Call.Callback mTelecomCallCallback = + new android.telecom.Call.Callback() { @Override public void onStateChanged(android.telecom.Call call, int newState) { - Log.d(this, "TelecommCallListener onStateChanged call=" + call + " newState=" + Log.d(this, "TelecommCallCallback onStateChanged call=" + call + " newState=" + newState); update(); } @@ -180,7 +180,7 @@ public final class Call { @Override public void onParentChanged(android.telecom.Call call, android.telecom.Call newParent) { - Log.d(this, "TelecommCallListener onParentChanged call=" + call + " newParent=" + Log.d(this, "TelecommCallCallback onParentChanged call=" + call + " newParent=" + newParent); update(); } @@ -194,7 +194,7 @@ public final class Call { @Override public void onDetailsChanged(android.telecom.Call call, android.telecom.Call.Details details) { - Log.d(this, "TelecommCallListener onStateChanged call=" + call + " details=" + Log.d(this, "TelecommCallCallback onStateChanged call=" + call + " details=" + details); update(); } @@ -202,7 +202,7 @@ public final class Call { @Override public void onCannedTextResponsesLoaded(android.telecom.Call call, List<String> cannedTextResponses) { - Log.d(this, "TelecommCallListener onStateChanged call=" + call + Log.d(this, "TelecommCallCallback onStateChanged call=" + call + " cannedTextResponses=" + cannedTextResponses); update(); } @@ -210,7 +210,7 @@ public final class Call { @Override public void onPostDialWait(android.telecom.Call call, String remainingPostDialSequence) { - Log.d(this, "TelecommCallListener onStateChanged call=" + call + Log.d(this, "TelecommCallCallback onStateChanged call=" + call + " remainingPostDialSequence=" + remainingPostDialSequence); update(); } @@ -218,15 +218,15 @@ public final class Call { @Override public void onVideoCallChanged(android.telecom.Call call, VideoCall videoCall) { - Log.d(this, "TelecommCallListener onStateChanged call=" + call + " videoCall=" + Log.d(this, "TelecommCallCallback onStateChanged call=" + call + " videoCall=" + videoCall); update(); } @Override public void onCallDestroyed(android.telecom.Call call) { - Log.d(this, "TelecommCallListener onStateChanged call=" + call); - call.removeListener(mTelecommCallListener); + Log.d(this, "TelecommCallCallback onStateChanged call=" + call); + call.unregisterCallback(mTelecomCallCallback); } @Override @@ -248,13 +248,13 @@ public final class Call { */ private int mModifyToVideoState = VideoProfile.VideoState.AUDIO_ONLY; - private InCallVideoCallListener mVideoCallListener; + private InCallVideoCallCallback mVideoCallCallback; public Call(android.telecom.Call telecommCall) { mTelecommCall = telecommCall; mId = ID_PREFIX + Integer.toString(sIdCounter++); updateFromTelecommCall(); - mTelecommCall.addListener(mTelecommCallListener); + mTelecommCall.registerCallback(mTelecomCallCallback); } public android.telecom.Call getTelecommCall() { @@ -285,10 +285,10 @@ public final class Call { setDisconnectCause(mTelecommCall.getDetails().getDisconnectCause()); if (mTelecommCall.getVideoCall() != null) { - if (mVideoCallListener == null) { - mVideoCallListener = new InCallVideoCallListener(this); + if (mVideoCallCallback == null) { + mVideoCallCallback = new InCallVideoCallCallback(this); } - mTelecommCall.getVideoCall().setVideoCallListener(mVideoCallListener); + mTelecommCall.getVideoCall().registerCallback(mVideoCallCallback); } mChildCallIds.clear(); diff --git a/InCallUI/src/com/android/incallui/CallList.java b/InCallUI/src/com/android/incallui/CallList.java index 39ada99de..df2a72e5e 100644 --- a/InCallUI/src/com/android/incallui/CallList.java +++ b/InCallUI/src/com/android/incallui/CallList.java @@ -77,7 +77,6 @@ public class CallList { } public void onCallAdded(android.telecom.Call telecommCall) { - Trace.beginSection("onCallAdded"); Call call = new Call(telecommCall); Log.d(this, "onCallAdded: callState=" + call.getState()); if (call.getState() == Call.State.INCOMING || @@ -86,7 +85,6 @@ public class CallList { } else { onUpdate(call); } - Trace.endSection(); } public void onCallRemoved(android.telecom.Call telecommCall) { diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index 4225f86fa..83d5af34e 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -38,6 +38,7 @@ import android.view.Window; import android.view.WindowManager; import com.android.contacts.common.interactions.TouchPointManager; +import com.android.contacts.common.testing.NeededForTesting; import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette; import com.android.incalluibind.ObjectFactory; import com.google.common.base.Preconditions; @@ -58,8 +59,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * that want to listen in on the in-call state changes. * TODO: This class has become more of a state machine at this point. Consider renaming. */ -public class InCallPresenter implements CallList.Listener, - CircularRevealFragment.OnCircularRevealCompleteListener { +public class InCallPresenter implements CallList.Listener { private static final String EXTRA_FIRST_TIME_SHOWN = "com.android.incallui.intent.extra.FIRST_TIME_SHOWN"; @@ -98,8 +98,8 @@ public class InCallPresenter implements CallList.Listener, private boolean mAccountSelectionCancelled = false; private InCallCameraManager mInCallCameraManager = null; - private final android.telecom.Call.Listener mCallListener = - new android.telecom.Call.Listener() { + private final android.telecom.Call.Callback mCallback = + new android.telecom.Call.Callback() { @Override public void onPostDialWait(android.telecom.Call call, String remainingPostDialSequence) { onPostDialCharWait( @@ -380,10 +380,7 @@ public class InCallPresenter implements CallList.Listener, * method invocation from InCallService. */ public void onCallAdded(android.telecom.Call call) { - // Since a call has been added we are no longer waiting for Telecom to send us a - // call. - setBoundAndWaitingForOutgoingCall(false, null); - call.addListener(mCallListener); + call.registerCallback(mCallback); } /** @@ -391,7 +388,7 @@ public class InCallPresenter implements CallList.Listener, * method invocation from InCallService. */ public void onCallRemoved(android.telecom.Call call) { - call.removeListener(mCallListener); + call.unregisterCallback(mCallback); } public void onCanAddCallChanged(boolean canAddCall) { diff --git a/InCallUI/src/com/android/incallui/InCallVideoCallListener.java b/InCallUI/src/com/android/incallui/InCallVideoCallCallback.java index 24c911949..f868b3baf 100644 --- a/InCallUI/src/com/android/incallui/InCallVideoCallListener.java +++ b/InCallUI/src/com/android/incallui/InCallVideoCallCallback.java @@ -23,9 +23,9 @@ import android.telecom.InCallService.VideoCall; import android.telecom.VideoProfile; /** - * Implements the InCallUI Video Call Listener. + * Implements the InCallUI VideoCall Callback. */ -public class InCallVideoCallListener extends VideoCall.Listener { +public class InCallVideoCallCallback extends VideoCall.Callback { /** * The call associated with this {@link InCallVideoClient}. @@ -37,7 +37,7 @@ public class InCallVideoCallListener extends VideoCall.Listener { * * @param call The call. */ - public InCallVideoCallListener(Call call) { + public InCallVideoCallCallback(Call call) { mCall = call; } @@ -57,9 +57,9 @@ public class InCallVideoCallListener extends VideoCall.Listener { // Check for upgrades to video and downgrades to audio. if (wasVideoCall && !isVideoCall) { - InCallVideoCallListenerNotifier.getInstance().downgradeToAudio(mCall); + InCallVideoCallCallbackNotifier.getInstance().downgradeToAudio(mCall); } else if (previousVideoState != newVideoState) { - InCallVideoCallListenerNotifier.getInstance().upgradeToVideoRequest(mCall, + InCallVideoCallCallbackNotifier.getInstance().upgradeToVideoRequest(mCall, newVideoState); } } @@ -80,17 +80,17 @@ public class InCallVideoCallListener extends VideoCall.Listener { Log.d(this, "onSessionModifyResponseReceived status=" + status + " requestedProfile=" + requestedProfile + " responseProfile=" + responseProfile); if (status != VideoProvider.SESSION_MODIFY_REQUEST_SUCCESS) { - InCallVideoCallListenerNotifier.getInstance().upgradeToVideoFail(status, mCall); + InCallVideoCallCallbackNotifier.getInstance().upgradeToVideoFail(status, mCall); } else if (requestedProfile != null && responseProfile != null) { boolean modifySucceeded = requestedProfile.getVideoState() == responseProfile.getVideoState(); boolean isVideoCall = VideoProfile.VideoState.isVideo(responseProfile.getVideoState()); if (modifySucceeded && isVideoCall) { - InCallVideoCallListenerNotifier.getInstance().upgradeToVideoSuccess(mCall); + InCallVideoCallCallbackNotifier.getInstance().upgradeToVideoSuccess(mCall); } else if (!modifySucceeded && isVideoCall) { - InCallVideoCallListenerNotifier.getInstance().upgradeToVideoFail(status, mCall); + InCallVideoCallCallbackNotifier.getInstance().upgradeToVideoFail(status, mCall); } else if (modifySucceeded && !isVideoCall) { - InCallVideoCallListenerNotifier.getInstance().downgradeToAudio(mCall); + InCallVideoCallCallbackNotifier.getInstance().downgradeToAudio(mCall); } } else { Log.d(this, "onSessionModifyResponseReceived request and response Profiles are null"); @@ -104,7 +104,7 @@ public class InCallVideoCallListener extends VideoCall.Listener { */ @Override public void onCallSessionEvent(int event) { - InCallVideoCallListenerNotifier.getInstance().callSessionEvent(event); + InCallVideoCallCallbackNotifier.getInstance().callSessionEvent(event); } /** @@ -115,7 +115,7 @@ public class InCallVideoCallListener extends VideoCall.Listener { */ @Override public void onPeerDimensionsChanged(int width, int height) { - InCallVideoCallListenerNotifier.getInstance().peerDimensionsChanged(mCall, width, height); + InCallVideoCallCallbackNotifier.getInstance().peerDimensionsChanged(mCall, width, height); } /** @@ -125,7 +125,7 @@ public class InCallVideoCallListener extends VideoCall.Listener { */ @Override public void onVideoQualityChanged(int videoQuality) { - InCallVideoCallListenerNotifier.getInstance().videoQualityChanged(mCall, videoQuality); + InCallVideoCallCallbackNotifier.getInstance().videoQualityChanged(mCall, videoQuality); } /** @@ -137,7 +137,7 @@ public class InCallVideoCallListener extends VideoCall.Listener { @Override public void onCallDataUsageChanged(long dataUsage) { Log.d(this, "onCallDataUsageChanged: dataUsage = " + dataUsage); - InCallVideoCallListenerNotifier.getInstance().callDataUsageChanged(dataUsage); + InCallVideoCallCallbackNotifier.getInstance().callDataUsageChanged(dataUsage); } /** @@ -148,7 +148,9 @@ public class InCallVideoCallListener extends VideoCall.Listener { */ @Override public void onCameraCapabilitiesChanged(CameraCapabilities cameraCapabilities) { - InCallVideoCallListenerNotifier.getInstance().cameraDimensionsChanged( - mCall, cameraCapabilities.getWidth(), cameraCapabilities.getHeight()); + if (cameraCapabilities != null) { + InCallVideoCallCallbackNotifier.getInstance().cameraDimensionsChanged( + mCall, cameraCapabilities.getWidth(), cameraCapabilities.getHeight()); + } } } diff --git a/InCallUI/src/com/android/incallui/InCallVideoCallListenerNotifier.java b/InCallUI/src/com/android/incallui/InCallVideoCallCallbackNotifier.java index 818ed032a..dfb645bfc 100644 --- a/InCallUI/src/com/android/incallui/InCallVideoCallListenerNotifier.java +++ b/InCallUI/src/com/android/incallui/InCallVideoCallCallbackNotifier.java @@ -23,14 +23,15 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; /** - * Class used by {@link InCallService.VideoCallListener} to notify interested parties of incoming + * Class used by {@link InCallService.VideoCallCallback} to notify interested parties of incoming * events. */ -public class InCallVideoCallListenerNotifier { +public class InCallVideoCallCallbackNotifier { /** * Singleton instance of this class. */ - private static InCallVideoCallListenerNotifier sInstance = new InCallVideoCallListenerNotifier(); + private static InCallVideoCallCallbackNotifier sInstance = + new InCallVideoCallCallbackNotifier(); /** * ConcurrentHashMap constructor params: 8 is initial table size, 0.9f is @@ -48,14 +49,14 @@ public class InCallVideoCallListenerNotifier { /** * Static singleton accessor method. */ - public static InCallVideoCallListenerNotifier getInstance() { + public static InCallVideoCallCallbackNotifier getInstance() { return sInstance; } /** * Private constructor. Instance should only be acquired through getInstance(). */ - private InCallVideoCallListenerNotifier() { + private InCallVideoCallCallbackNotifier() { } /** diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java index 9589c1b49..f87112945 100644 --- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java +++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java @@ -33,8 +33,8 @@ import com.android.incallui.InCallPresenter.InCallDetailsListener; import com.android.incallui.InCallPresenter.InCallOrientationListener; import com.android.incallui.InCallPresenter.InCallStateListener; import com.android.incallui.InCallPresenter.IncomingCallListener; -import com.android.incallui.InCallVideoCallListenerNotifier.SurfaceChangeListener; -import com.android.incallui.InCallVideoCallListenerNotifier.VideoEventListener; +import com.android.incallui.InCallVideoCallCallbackNotifier.SurfaceChangeListener; +import com.android.incallui.InCallVideoCallCallbackNotifier.VideoEventListener; import com.google.common.base.Preconditions; import java.util.Objects; @@ -64,7 +64,7 @@ import java.util.Objects; public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi> implements IncomingCallListener, InCallOrientationListener, InCallStateListener, InCallDetailsListener, SurfaceChangeListener, VideoEventListener, - InCallVideoCallListenerNotifier.SessionModificationListener { + InCallVideoCallCallbackNotifier.SessionModificationListener { public static final String TAG = "VideoCallPresenter"; /** @@ -191,9 +191,9 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi InCallPresenter.getInstance().addDetailsListener(this); // Register for surface and video events from {@link InCallVideoCallListener}s. - InCallVideoCallListenerNotifier.getInstance().addSurfaceChangeListener(this); - InCallVideoCallListenerNotifier.getInstance().addVideoEventListener(this); - InCallVideoCallListenerNotifier.getInstance().addSessionModificationListener(this); + InCallVideoCallCallbackNotifier.getInstance().addSurfaceChangeListener(this); + InCallVideoCallCallbackNotifier.getInstance().addVideoEventListener(this); + InCallVideoCallCallbackNotifier.getInstance().addSessionModificationListener(this); mCurrentVideoState = VideoProfile.VideoState.AUDIO_ONLY; mCurrentCallState = Call.State.INVALID; } @@ -213,9 +213,9 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi InCallPresenter.getInstance().removeIncomingCallListener(this); InCallPresenter.getInstance().removeOrientationListener(this); - InCallVideoCallListenerNotifier.getInstance().removeSurfaceChangeListener(this); - InCallVideoCallListenerNotifier.getInstance().removeVideoEventListener(this); - InCallVideoCallListenerNotifier.getInstance().removeSessionModificationListener(this); + InCallVideoCallCallbackNotifier.getInstance().removeSurfaceChangeListener(this); + InCallVideoCallCallbackNotifier.getInstance().removeVideoEventListener(this); + InCallVideoCallCallbackNotifier.getInstance().removeSessionModificationListener(this); } /** diff --git a/InCallUI/src/com/android/incallui/VideoPauseController.java b/InCallUI/src/com/android/incallui/VideoPauseController.java index c465bd22e..14e43b175 100644 --- a/InCallUI/src/com/android/incallui/VideoPauseController.java +++ b/InCallUI/src/com/android/incallui/VideoPauseController.java @@ -33,7 +33,7 @@ import com.android.incallui.Call.State; import com.android.incallui.InCallPresenter.InCallState; import com.android.incallui.InCallPresenter.InCallStateListener; import com.android.incallui.InCallPresenter.IncomingCallListener; -import com.android.incallui.InCallVideoCallListenerNotifier.SessionModificationListener; +import com.android.incallui.InCallVideoCallCallbackNotifier.SessionModificationListener; import com.google.common.base.Preconditions; /** @@ -118,7 +118,7 @@ class VideoPauseController implements InCallStateListener, IncomingCallListener, mInCallPresenter = Preconditions.checkNotNull(inCallPresenter); mInCallPresenter.addListener(this); mInCallPresenter.addIncomingCallListener(this); - InCallVideoCallListenerNotifier.getInstance().addSessionModificationListener(this); + InCallVideoCallCallbackNotifier.getInstance().addSessionModificationListener(this); } /** @@ -127,7 +127,7 @@ class VideoPauseController implements InCallStateListener, IncomingCallListener, */ public void tearDown() { log("tearDown..."); - InCallVideoCallListenerNotifier.getInstance().removeSessionModificationListener(this); + InCallVideoCallCallbackNotifier.getInstance().removeSessionModificationListener(this); mInCallPresenter.removeListener(this); mInCallPresenter.removeIncomingCallListener(this); clear(); |