From b95cf78480e2bdb6d1c38c897bab621ec20dec02 Mon Sep 17 00:00:00 2001
From: Nancy Chen <nancychen@google.com>
Date: Wed, 22 Oct 2014 12:11:43 -0700
Subject: InCallUI should report to Telecom when user sets default account via
 dialog

Modify the phoneAccountSelected method to support the option to set the
selected phone account as the default for outgoing phone calls.
Refactor InCallUI to support this feature.

Bug: 18078232
Change-Id: I4d90a58c896f036020cc7e3ea63b0493976042a4
---
 InCallUI/src/com/android/incallui/InCallActivity.java  | 8 +++++---
 InCallUI/src/com/android/incallui/InCallPresenter.java | 4 ++--
 InCallUI/src/com/android/incallui/TelecomAdapter.java  | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'InCallUI')

diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index a6917c86a..a7ef6c8a1 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -535,8 +535,10 @@ public class InCallActivity extends Activity {
 
                 SelectPhoneAccountListener listener = new SelectPhoneAccountListener() {
                     @Override
-                    public void onPhoneAccountSelected(PhoneAccountHandle selectedAccountHandle) {
-                        InCallPresenter.getInstance().handleAccountSelection(selectedAccountHandle);
+                    public void onPhoneAccountSelected(PhoneAccountHandle selectedAccountHandle,
+                            boolean setDefault) {
+                        InCallPresenter.getInstance().handleAccountSelection(selectedAccountHandle,
+                                setDefault);
                     }
                     @Override
                     public void onDialogDismissed() {
@@ -544,7 +546,7 @@ public class InCallActivity extends Activity {
                     }
                 };
 
-                SelectPhoneAccountDialogFragment.showAccountDialog(getFragmentManager(),
+                SelectPhoneAccountDialogFragment.showAccountDialog(getFragmentManager(), true,
                         phoneAccountHandles, listener);
             } else {
                 mCallCardFragment.setVisible(true);
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 6f3d1b399..2f781421d 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -461,11 +461,11 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener {
         return mProximitySensor;
     }
 
-    public void handleAccountSelection(PhoneAccountHandle accountHandle) {
+    public void handleAccountSelection(PhoneAccountHandle accountHandle, boolean setDefault) {
         Call call = mCallList.getWaitingForAccountCall();
         if (call != null) {
             String callId = call.getId();
-            TelecomAdapter.getInstance().phoneAccountSelected(callId, accountHandle);
+            TelecomAdapter.getInstance().phoneAccountSelected(callId, accountHandle, setDefault);
         }
     }
 
diff --git a/InCallUI/src/com/android/incallui/TelecomAdapter.java b/InCallUI/src/com/android/incallui/TelecomAdapter.java
index 62b1bfc83..b0c170ab4 100644
--- a/InCallUI/src/com/android/incallui/TelecomAdapter.java
+++ b/InCallUI/src/com/android/incallui/TelecomAdapter.java
@@ -232,9 +232,9 @@ final class TelecomAdapter implements InCallPhoneListener {
         }
     }
 
-    void phoneAccountSelected(String callId, PhoneAccountHandle accountHandle) {
+    void phoneAccountSelected(String callId, PhoneAccountHandle accountHandle, boolean setDefault) {
         if (mPhone != null) {
-            getTelecommCallById(callId).phoneAccountSelected(accountHandle);
+            getTelecommCallById(callId).phoneAccountSelected(accountHandle, setDefault);
         }  else {
             Log.e(this, "error phoneAccountSelected, mAdapter is null");
         }
-- 
cgit v1.2.3