commit 9ef05cb6459e82d5b5ea1490e88e3618a1e668ea
author Daniel Lehmann <lehmannd@google.com> Thu Aug 05 18:50:11 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 05 18:50:11 2010 -0700
tree 81c224f7ef245a2a7639332e81b7a0a07b16a158
parent c035d83a01b8c82a286298f29fae9e3989de0d29
parent f9d9d43da7d9e5a59b27d9fbb47cbd25985b7ce4

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

Merge commit 'f9d9d43da7d9e5a59b27d9fbb47cbd25985b7ce4' into gingerbread-plus-aosp

* commit 'f9d9d43da7d9e5a59b27d9fbb47cbd25985b7ce4':
  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 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