diff options
author | Nancy Chen <nancychen@google.com> | 2014-09-08 18:33:05 -0700 |
---|---|---|
committer | Nancy Chen <nancychen@google.com> | 2014-09-08 18:33:05 -0700 |
commit | ea4ffe5c3c0a22bc6ff6e995ce954eec84fad7bc (patch) | |
tree | 7af69aa529111bf4a15110680575668d885dc2f3 /InCallUI | |
parent | e7e294d880c8cdda8ddec98624f1a986af5d9ee0 (diff) |
Make changes to Connection in Telecomm API (4/4)
* onPhoneAccountClicked removed
* onSetAudioState -> onAudioStateChanged
* onSetState -> onStateChanged
Bug: 17329632
Change-Id: Ib949b5565fea0ce7d241ed5af5619b3509c0218d
Diffstat (limited to 'InCallUI')
3 files changed, 0 insertions, 24 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index 97949097a..fc5c79bd6 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -70,7 +70,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr private TextView mPhoneNumber; private TextView mNumberLabel; private TextView mPrimaryName; - private View mCallStateButton; private ImageView mCallStateIcon; private ImageView mCallStateVideoCallIcon; private TextView mCallStateLabel; @@ -220,14 +219,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr } }); - mCallStateButton = view.findViewById(R.id.callStateButton); - mCallStateButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - getPresenter().phoneAccountClicked(); - } - }); - mManageConferenceCallButton = view.findViewById(R.id.manage_conference_call_button); mManageConferenceCallButton.setOnClickListener(new View.OnClickListener() { @Override diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index ea324ba66..97ef6c45a 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -349,13 +349,6 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> } } - public void phoneAccountClicked() { - if (mPrimary == null) { - return; - } - TelecommAdapter.getInstance().phoneAccountClicked(mPrimary.getId()); - } - private void maybeStartSearch(Call call, boolean isPrimary) { // no need to start search for conference calls which show generic info. if (call != null && !call.isConferenceCall()) { diff --git a/InCallUI/src/com/android/incallui/TelecommAdapter.java b/InCallUI/src/com/android/incallui/TelecommAdapter.java index a346cafb0..bf7f51d07 100644 --- a/InCallUI/src/com/android/incallui/TelecommAdapter.java +++ b/InCallUI/src/com/android/incallui/TelecommAdapter.java @@ -221,14 +221,6 @@ final class TelecommAdapter implements InCallPhoneListener { } } - void phoneAccountClicked(String callId) { - if (mPhone != null) { - getTelecommCallById(callId).phoneAccountClicked(); - } else { - Log.e(this, "error phoneAccountClicked, mPhone is null"); - } - } - void phoneAccountSelected(String callId, PhoneAccountHandle accountHandle) { if (mPhone != null) { getTelecommCallById(callId).phoneAccountSelected(accountHandle); |