diff options
author | Evan Charlton <evanc@google.com> | 2014-06-03 14:10:28 -0700 |
---|---|---|
committer | Evan Charlton <evanc@google.com> | 2014-06-04 17:21:09 -0700 |
commit | db4865ebdf84dfdc099d24ef261fd0d93ff11bd8 (patch) | |
tree | 0d40afe6c51d773cbb2bfa74ebe3527a326cbe53 | |
parent | e405eb79a3d5fcd066c65360831f3649078ba687 (diff) |
Wire up DTMF post-dial
Wire up the DTMF post-dial dialog.
Bug: 13734588
Change-Id: I5cc06268590c3c424ea6daf216cb205b9c470dac
3 files changed, 5 insertions, 9 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallServiceImpl.java b/InCallUI/src/com/android/incallui/InCallServiceImpl.java index bcafbee4f..bc1311af6 100644 --- a/InCallUI/src/com/android/incallui/InCallServiceImpl.java +++ b/InCallUI/src/com/android/incallui/InCallServiceImpl.java @@ -99,7 +99,7 @@ public class InCallServiceImpl extends InCallService { /** {@inheritDoc} */ @Override protected void setPostDialWait(String callId, String remaining) { - // TODO(ihab): Add post-dial state to user interface + InCallPresenter.getInstance().onPostDialCharWait(callId, remaining); } /** {@inheritDoc} */ diff --git a/InCallUI/src/com/android/incallui/PostCharDialogFragment.java b/InCallUI/src/com/android/incallui/PostCharDialogFragment.java index 275042559..5925acee7 100644 --- a/InCallUI/src/com/android/incallui/PostCharDialogFragment.java +++ b/InCallUI/src/com/android/incallui/PostCharDialogFragment.java @@ -52,7 +52,7 @@ public class PostCharDialogFragment extends DialogFragment { builder.setPositiveButton(R.string.pause_prompt_yes, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int whichButton) { - TelecommAdapter.getInstance().postDialContinue(mCallId); + TelecommAdapter.getInstance().postDialContinue(mCallId, true); } }); builder.setNegativeButton(R.string.pause_prompt_no, new DialogInterface.OnClickListener() { @@ -71,6 +71,6 @@ public class PostCharDialogFragment extends DialogFragment { public void onCancel(DialogInterface dialog) { super.onCancel(dialog); - TelecommAdapter.getInstance().postDialCancel(mCallId); + TelecommAdapter.getInstance().postDialContinue(mCallId, false); } } diff --git a/InCallUI/src/com/android/incallui/TelecommAdapter.java b/InCallUI/src/com/android/incallui/TelecommAdapter.java index f3a75465e..1828678f4 100644 --- a/InCallUI/src/com/android/incallui/TelecommAdapter.java +++ b/InCallUI/src/com/android/incallui/TelecommAdapter.java @@ -130,18 +130,14 @@ final class TelecommAdapter { } } - void postDialContinue(String callId) { + void postDialContinue(String callId, boolean proceed) { if (mAdapter != null) { - mAdapter.postDialContinue(callId); + mAdapter.postDialContinue(callId, proceed); } else { Log.e(this, "error postDialContinue, mAdapter is null"); } } - void postDialCancel(String callId) { - Log.wtf(this, "postDialCancel not implemented"); - } - void handoffCall(String callId) { if (mAdapter != null) { mAdapter.handoffCall(callId); |