commit e31738eed907d9e38ec0e3abed4e29fd0eaf62e8
author Nancy Chen <nancychen@google.com> Thu Oct 23 15:03:04 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 23 15:03:04 2014 +0000
tree ee67d51d906f42634bfa096fc363c3a063784908
parent 0d284509b568082883a4ad8bb608c17c689e88f8
parent de5a2d0fd705bc245f4516ed6e37114379c54a3a

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

* commit 'f826a8f12d2e32aa19f906eb424a5fcdb8840205':
  InCallUI should report to Telecom when user sets default account via dialog

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 bbec3bc..27d17c4 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -528,8 +528,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() {
@@ -537,7 +539,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");
         }