commit 669b608b31d468084bbae81ba8c51fec44814b18
author Yorke Lee <yorkelee@google.com> Tue Sep 17 15:43:38 2013 -0700
committer Yorke Lee <yorkelee@google.com> Tue Sep 17 15:43:38 2013 -0700
tree 8ae9eac4943618d87da9894de304dde7bbec94a7
parent e40ea13d87f3d409453bd22555d9aafcb8fa0639

Fix regression: dialpad not being shown from dial intent

Bug: 10804039
Change-Id: I4449a1bc7997738e39c87493d0d038870b19597b

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 4680038..4c747c9 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -639,12 +639,15 @@
             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);
         }
     }