From 5edb613e89236f8a10e99533a67b5c2006749dcb Mon Sep 17 00:00:00 2001 From: Nancy Chen Date: Mon, 18 Aug 2014 20:35:00 -0700 Subject: Circle reveal for account selection dialog and check for valid account. Touch animation reveal should happen from where the user touches the screen. This change deals only with the account selection dialog case (and should be the last one). Also if phoneAccountSelected in TelecommAdapter is called with an empty accountHandle, log an error. Bug: 17124195 Change-Id: I381ec7e377ee3be981c4e8b63b5253d75561b6bf --- .../src/com/android/incallui/InCallActivity.java | 22 ++++++++++++++-------- .../src/com/android/incallui/TelecommAdapter.java | 4 ++++ 2 files changed, 18 insertions(+), 8 deletions(-) (limited to 'InCallUI/src') diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index cbb2af280..02635dccc 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -454,14 +454,20 @@ public class InCallActivity extends Activity { intent.removeExtra(NEW_OUTGOING_CALL); Point touchPoint = null; - Call call = CallList.getInstance().getOutgoingCall(); - if (call == null) { - call = CallList.getInstance().getPendingOutgoingCall(); - } - if (call != null) { - Bundle extras = call.getTelecommCall().getDetails().getExtras(); - touchPoint = (Point) (extras == null ? - null : extras.getParcelable(TouchPointManager.TOUCH_POINT)); + if (TouchPointManager.getInstance().hasValidPoint()) { + // Use the most immediate touch point in the InCallUi if available + touchPoint = TouchPointManager.getInstance().getPoint(); + } else { + // Otherwise retrieve the touch point from the call intent + Call call = CallList.getInstance().getOutgoingCall(); + if (call == null) { + call = CallList.getInstance().getPendingOutgoingCall(); + } + if (call != null) { + Bundle extras = call.getTelecommCall().getDetails().getExtras(); + touchPoint = (Point) (extras == null ? + null : extras.getParcelable(TouchPointManager.TOUCH_POINT)); + } } mCallCardFragment.animateForNewOutgoingCall(touchPoint); } diff --git a/InCallUI/src/com/android/incallui/TelecommAdapter.java b/InCallUI/src/com/android/incallui/TelecommAdapter.java index 22aff11a9..1f5c9c59b 100644 --- a/InCallUI/src/com/android/incallui/TelecommAdapter.java +++ b/InCallUI/src/com/android/incallui/TelecommAdapter.java @@ -220,5 +220,9 @@ final class TelecommAdapter implements InCallPhoneListener { } else { Log.e(this, "error phoneAccountSelected, mAdapter is null"); } + + if (accountHandle == null) { + Log.e(this, "error phoneAccountSelected, accountHandle is null"); + } } } -- cgit v1.2.3