From 7f78e9a692d7d7ca1f1204421adce91545a880f8 Mon Sep 17 00:00:00 2001 From: yueg Date: Tue, 12 Sep 2017 11:10:45 -0700 Subject: Log swiping and clicking for switching tabs. If it's a swipe, onPageScrolled() is called several times before onPageScrollStateChanged(SCROLL_STATE_SETTLING) and onPageSelected(). If it's a click, only onPageScrollStateChanged(SCROLL_STATE_SETTLING) is called before onPageSelected(). And onPageScrollStateChanged(SCROLL_STATE_SETTLING) will not be called if user don't switch to a new tab. We use the difference to tell if user switching tabs by swiping or clicking. Test: DialtactsActivityTest PiperOrigin-RevId: 168403148 Change-Id: Iaaf84ab9c4955d0bc2c1e9857ba59fd37b3984af --- .../incallui/videotech/ims/ImsVideoCallCallback.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'java/com/android/incallui') diff --git a/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java b/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java index b83929304..49170b8dc 100644 --- a/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java +++ b/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java @@ -66,10 +66,16 @@ public class ImsVideoCallCallback extends VideoCall.Callback { "ImsVideoTech.onSessionModifyRequestReceived", "call downgraded to %d", newVideoState); } else if (previousVideoState != newVideoState) { requestedVideoState = newVideoState; - videoTech.setSessionModificationState( - SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST); - listener.onVideoUpgradeRequestReceived(); - logger.logImpression(DialerImpression.Type.IMS_VIDEO_REQUEST_RECEIVED); + if (!wasVideoCall) { + videoTech.setSessionModificationState( + SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST); + listener.onVideoUpgradeRequestReceived(); + logger.logImpression(DialerImpression.Type.IMS_VIDEO_REQUEST_RECEIVED); + } else { + LogUtil.i( + "ImsVideoTech.onSessionModifyRequestReceived", "call updated to %d", newVideoState); + videoTech.acceptVideoRequest(); + } } } -- cgit v1.2.3