summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-11-08 09:26:26 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-08 09:26:26 -0800
commit967e0ed38987125bdbdcfc080c90f2d6201f799f (patch)
treef864e8b30b4f3b9c05efceb2a434a2d9c7a516d7
parent140628f40a8b3867d839ab516433bd64d17d765c (diff)
parentcce501cbde0ba0a53e1f458328bb96dff4dd6588 (diff)
am cce501cb: Fix bug where resuming CallDetailActivity loses the add contact intent
* commit 'cce501cbde0ba0a53e1f458328bb96dff4dd6588': Fix bug where resuming CallDetailActivity loses the add contact intent
-rw-r--r--src/com/android/dialer/CallDetailActivity.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index 2b16a983b..a24940d73 100644
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -489,6 +489,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
nameOrNumber = firstDetails.number;
}
+ boolean skipBind = false;
+
if (contactUri != null && !UriUtils.isEncodedContactUri(contactUri)) {
mainActionIntent = new Intent(Intent.ACTION_VIEW, contactUri);
// This will launch People's detail contact screen, so we probably want to
@@ -505,6 +507,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
mainActionIntent = null;
mainActionIcon = R.drawable.ic_add_contact_holo_dark;
mainActionDescription = getString(R.string.description_add_contact);
+ skipBind = true;
} else if (isVoicemailNumber) {
mainActionIntent = null;
mainActionIcon = 0;
@@ -536,7 +539,10 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
mainActionDescription = null;
}
- bindContactPhotoAction(mainActionIntent, mainActionIcon, mainActionDescription);
+ if (!skipBind) {
+ bindContactPhotoAction(mainActionIntent, mainActionIcon,
+ mainActionDescription);
+ }
// This action allows to call the number that places the call.
if (canPlaceCallsTo) {