commit de5a2d0fd705bc245f4516ed6e37114379c54a3a
author Nancy Chen <nancychen@google.com> Thu Oct 23 00:42:28 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 23 00:42:29 2014 +0000
tree 8d2c7c93755a9f78aab04cea8eee2cc0c7d052e2
parent 9f38e0a4989affa14c787a6730d8963377c80ff1
parent b95cf78480e2bdb6d1c38c897bab621ec20dec02

Merge "InCallUI should report to Telecom when user sets default account via dialog" into lmp-sprout-dev

InCallUI/src/com/android/incallui/InCallActivity.java

diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index a6917c8..a7ef6c8 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -535,8 +535,10 @@
 
                 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 @@
                     }
                 };
 
-                SelectPhoneAccountDialogFragment.showAccountDialog(getFragmentManager(),
+                SelectPhoneAccountDialogFragment.showAccountDialog(getFragmentManager(), true,
                         phoneAccountHandles, listener);
             } else {
                 mCallCardFragment.setVisible(true);

InCallUI/src/com/android/incallui/InCallPresenter.java

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 6f3d1b3..2f78142 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -461,11 +461,11 @@
         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);
         }
     }
 

InCallUI/src/com/android/incallui/TelecomAdapter.java

diff --git a/InCallUI/src/com/android/incallui/TelecomAdapter.java b/InCallUI/src/com/android/incallui/TelecomAdapter.java
index 62b1bfc..b0c170a 100644
--- a/InCallUI/src/com/android/incallui/TelecomAdapter.java
+++ b/InCallUI/src/com/android/incallui/TelecomAdapter.java
@@ -232,9 +232,9 @@
         }
     }
 
-    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");
         }