From 48cce92eeaf16280b48987da4e020d1e09f96289 Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Thu, 14 Sep 2017 14:28:46 -0700
Subject: Dialpad chooser now properly shows when in a call.

Bug: 65212837
Test: DialpadFragmentTest
PiperOrigin-RevId: 168745371
Change-Id: I62da45cdac58e3387343589b952e5d6bce7a4ee2
---
 java/com/android/dialer/app/DialtactsActivity.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'java/com/android/dialer/app/DialtactsActivity.java')

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()) {
-- 
cgit v1.2.3