summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-11-08 09:54:25 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-08 09:54:25 -0800
commit6b170570ce135d2709bdc16e124481095d9242a6 (patch)
tree62111591604c7ea8f810f93ba32a1600ead169c4 /src
parent83855eb7b243a83de18cf508f48d6b955463808d (diff)
parentc317b8363d2369b4651fc4d88fa8c711f45ab23b (diff)
am c317b836: am 967e0ed3: am cce501cb: Fix bug where resuming CallDetailActivity loses the add contact intent
* commit 'c317b8363d2369b4651fc4d88fa8c711f45ab23b': Fix bug where resuming CallDetailActivity loses the add contact intent
Diffstat (limited to 'src')
-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) {