diff options
author | Chiao Cheng <chiaocheng@google.com> | 2013-07-25 01:21:34 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-25 01:21:35 +0000 |
commit | b6fd68d9358bfedbec99b17c81d5a9fa342ba4a6 (patch) | |
tree | 68f33a7dbb5943bd3aa9e56e08ba7064eb457763 /InCallUI | |
parent | 01576533fef1e7e106cec6bd62241eaa06d71cfa (diff) | |
parent | 3d1b6528a199c5a3e5a9053d476955037c4c6836 (diff) |
Merge "Integrating end call button to command service."
Diffstat (limited to 'InCallUI')
3 files changed, 23 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java index 4c74f4a51..8b90c5d49 100644 --- a/InCallUI/src/com/android/incallui/CallButtonFragment.java +++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java @@ -23,6 +23,7 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import android.widget.CompoundButton; import android.widget.ToggleButton; @@ -50,6 +51,15 @@ public class CallButtonFragment extends BaseFragment<CallButtonPresenter> implem public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { final View parent = inflater.inflate(R.layout.call_button_fragment, container, false); + + final View endCallButton = parent.findViewById(R.id.endButton); + endCallButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + getPresenter().endCallClicked(); + } + }); + final ToggleButton toggleButton = (ToggleButton) parent.findViewById(R.id.muteButton); toggleButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java index db727f38f..122e48d85 100644 --- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java +++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java @@ -40,6 +40,11 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto getUi().setVisible(); } + public void endCallClicked() { + // TODO(klp): hook up call id. + CallCommandClient.getInstance().disconnectCall(1); + } + public void muteClicked(boolean checked) { CallCommandClient.getInstance().mute(checked); getUi().setMute(checked); diff --git a/InCallUI/src/com/android/incallui/CallCommandClient.java b/InCallUI/src/com/android/incallui/CallCommandClient.java index 5868fb817..4b2512bce 100644 --- a/InCallUI/src/com/android/incallui/CallCommandClient.java +++ b/InCallUI/src/com/android/incallui/CallCommandClient.java @@ -59,6 +59,14 @@ public class CallCommandClient { } } + public void disconnectCall(int callId) { + try { + mCommandService.disconnectCall(callId); + } catch (RemoteException e) { + Log.e(TAG, "Error answering call.", e); + } + } + public void mute(boolean onOff) { try { mCommandService.mute(onOff); |