commit f9d9d43da7d9e5a59b27d9fbb47cbd25985b7ce4
author Daniel Lehmann <lehmannd@google.com> Thu Aug 05 18:48:40 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 05 18:48:40 2010 -0700
tree 1a44175480d74619bba3239135fa2db066adf52b
parent 8947414134e9943499ccce9fcd38b2c3864a34c4
parent 7ca5e4df0d21f223e7c0853ec187c0d008b63047

Merge "ACTION_DIAL should show dialpadchooser" into gingerbread

src/com/android/contacts/TwelveKeyDialer.java

diff --git a/src/com/android/contacts/TwelveKeyDialer.java b/src/com/android/contacts/TwelveKeyDialer.java
index 07927de..a16ca32 100644
--- a/src/com/android/contacts/TwelveKeyDialer.java
+++ b/src/com/android/contacts/TwelveKeyDialer.java
@@ -324,6 +324,11 @@
                         }
                     }
                 }
+            } else {
+                // Like ACTION_MAIN
+                // If there's already an active call, bring up an intermediate UI
+                // to make the user confirm what they really want to do.
+                needToShowDialpadChooser = phoneIsInUse();
             }
         } else if (Intent.ACTION_MAIN.equals(action)) {
             // The MAIN action means we're bringing up a blank dialer