commit d766c78fd2be15957353cbe5e7f4ab14732b7a84
author Daniel Lehmann <lehmannd@google.com> Thu Aug 05 18:52:18 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 05 18:52:18 2010 -0700
tree 76556f4cf5077d9ee55c60660c61b040ac186b14
parent ee7d1fa29c7bbb78012705cab21581995e507843
parent 9ef05cb6459e82d5b5ea1490e88e3618a1e668ea

am 9ef05cb6: am f9d9d43d: Merge "ACTION_DIAL should show dialpadchooser" into gingerbread

Merge commit '9ef05cb6459e82d5b5ea1490e88e3618a1e668ea'

* commit '9ef05cb6459e82d5b5ea1490e88e3618a1e668ea':
  ACTION_DIAL should show dialpadchooser

src/com/android/contacts/TwelveKeyDialer.java

diff --git a/src/com/android/contacts/TwelveKeyDialer.java b/src/com/android/contacts/TwelveKeyDialer.java
index 5feecfc..de53293 100644
--- a/src/com/android/contacts/TwelveKeyDialer.java
+++ b/src/com/android/contacts/TwelveKeyDialer.java
@@ -325,6 +325,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