diff options
author | Evan Charlton <evanc@google.com> | 2014-06-05 22:52:07 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-05 22:52:08 +0000 |
commit | 561374c01312e1d2daa526a38f66f28c822573e5 (patch) | |
tree | 3e8e3fccec3c2ce70db0133411f00101493ec96d | |
parent | b42b68d0a67bf1e8146cb54a93717293a8778406 (diff) | |
parent | db4865ebdf84dfdc099d24ef261fd0d93ff11bd8 (diff) |
Merge "Wire up DTMF post-dial" into lmp-preview-dev
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 1ca19db46..e6085702b 100644 --- a/InCallUI/src/com/android/incallui/InCallServiceImpl.java +++ b/InCallUI/src/com/android/incallui/InCallServiceImpl.java @@ -97,7 +97,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); |