summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-09-17 15:43:38 -0700
committerYorke Lee <yorkelee@google.com>2013-09-17 15:43:38 -0700
commit669b608b31d468084bbae81ba8c51fec44814b18 (patch)
tree8ae9eac4943618d87da9894de304dde7bbec94a7 /src
parente40ea13d87f3d409453bd22555d9aafcb8fa0639 (diff)
Fix regression: dialpad not being shown from dial intent
Bug: 10804039 Change-Id: I4449a1bc7997738e39c87493d0d038870b19597b
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/DialtactsActivity.java13
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);
}
}