diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-15 16:26:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-15 16:26:23 +0000 |
| commit | 235ecb1b43c6afce0880d034f5bd33d2ce61c8ac (patch) | |
| tree | e44c373ad2348b9f6413e9befe3ad8de36da548d /java/com/android/dialer/app/DialtactsActivity.java | |
| parent | 22195008a3a5264aec2ca9352d33338428444032 (diff) | |
| parent | 48cce92eeaf16280b48987da4e020d1e09f96289 (diff) | |
Merge "Dialpad chooser now properly shows when in a call."
Diffstat (limited to 'java/com/android/dialer/app/DialtactsActivity.java')
| -rw-r--r-- | java/com/android/dialer/app/DialtactsActivity.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java index ec67f5498..0b2f37505 100644 --- a/java/com/android/dialer/app/DialtactsActivity.java +++ b/java/com/android/dialer/app/DialtactsActivity.java @@ -1074,12 +1074,14 @@ public class DialtactsActivity extends TransactionSafeActivity && phoneIsInUse() && !DialpadFragment.isAddCallMode(intent); boolean isDialIntent = intent.getData() != null && isDialIntent(intent); - if (showDialpadChooser || isDialIntent) { + boolean isAddCallIntent = DialpadFragment.isAddCallMode(intent); + if (showDialpadChooser || isDialIntent || isAddCallIntent) { LogUtil.i( "DialtactsActivity.displayFragment", - "showing dialpad fragment (showDialpadChooser: %b, isDialIntent: %b)", + "show dialpad fragment (showDialpadChooser: %b, isDialIntent: %b, isAddCallIntent: %b)", showDialpadChooser, - isDialIntent); + isDialIntent, + isAddCallIntent); showDialpadFragment(false); mDialpadFragment.setStartedFromNewIntent(true); if (showDialpadChooser && !mDialpadFragment.isVisible()) { |