diff options
author | Yorke Lee <yorkelee@google.com> | 2013-09-17 18:11:06 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-17 18:11:06 -0700 |
commit | 3b5a28565a31e969fed32bc0f03ba4682fb505b9 (patch) | |
tree | 8ae9eac4943618d87da9894de304dde7bbec94a7 | |
parent | ee4cfc16541edd4a2bb7e4a81147d65129ac6d75 (diff) | |
parent | 6e6443e7c8abf8a48cbacfd84617e9b5c36c448f (diff) |
am 6e6443e7: am 669b608b: Fix regression: dialpad not being shown from dial intent
* commit '6e6443e7c8abf8a48cbacfd84617e9b5c36c448f':
Fix regression: dialpad not being shown from dial intent
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 468003806..4c747c95b 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -639,12 +639,15 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O return; } - if (mDialpadFragment != null && (phoneIsInUse() || isDialIntent(intent))) { - mDialpadFragment.setStartedFromNewIntent(true); - if (!mDialpadFragment.isVisible()) { - mInCallDialpadUp = true; + if (mDialpadFragment != null) { + final boolean phoneIsInUse = phoneIsInUse(); + if (phoneIsInUse || isDialIntent(intent)) { + mDialpadFragment.setStartedFromNewIntent(true); + if (phoneIsInUse && !mDialpadFragment.isVisible()) { + mInCallDialpadUp = true; + } + showDialpadFragment(false); } - showDialpadFragment(false); } } |