diff options
author | Nancy Chen <nancychen@google.com> | 2014-10-23 00:42:28 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-23 00:42:29 +0000 |
commit | de5a2d0fd705bc245f4516ed6e37114379c54a3a (patch) | |
tree | 8d2c7c93755a9f78aab04cea8eee2cc0c7d052e2 /InCallUI | |
parent | 9f38e0a4989affa14c787a6730d8963377c80ff1 (diff) | |
parent | b95cf78480e2bdb6d1c38c897bab621ec20dec02 (diff) |
Merge "InCallUI should report to Telecom when user sets default account via dialog" into lmp-sprout-dev
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 8 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 4 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/TelecomAdapter.java | 4 |
3 files changed, 9 insertions, 7 deletions
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"); } |