summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuchand Ghosh <suchan@codeaurora.org>2014-09-08 12:01:18 +0530
committerLinux Build Service Account <lnxbuild@localhost>2014-11-04 08:28:19 -0700
commit716d4add35921aa899d0186626d85d9c8849db37 (patch)
treebe8f1398bd4ac954f783c2157488e7a93c84f54a
parentb674c9f1db50d3075ef87732b7272b9a1ce8f281 (diff)
downloadandroid_packages_apps_Dialer-716d4add35921aa899d0186626d85d9c8849db37.tar.gz
android_packages_apps_Dialer-716d4add35921aa899d0186626d85d9c8849db37.tar.bz2
android_packages_apps_Dialer-716d4add35921aa899d0186626d85d9c8849db37.zip
IMS: Add participant support
Insert "add_participant" extra to dial intent. Change-Id: I42fa59d35ab5027500aea460dd8dc077d6bcf952 CRs-Fixed: 720697
-rw-r--r--src/com/android/dialer/dialpad/DialpadFragment.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index c9070d7d2..ee799dd07 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -219,6 +219,10 @@ public class DialpadFragment extends AnalyticsFragment
/** Identifier for the "Add Call" intent extra. */
private static final String ADD_CALL_MODE_KEY = "add_call_mode";
+ /** Identifier for the "Add Participant" intent extra. */
+ private static final String ADD_PARTICIPANT_KEY = "add_participant";
+ private boolean mAddParticipant = false;
+
/**
* Identifier for intent extra for sending an empty Flash message for
* CDMA networks. This message is used by the network to simulate a
@@ -546,6 +550,9 @@ public class DialpadFragment extends AnalyticsFragment
}
}
+ } else {
+ mAddParticipant = intent.getBooleanExtra(ADD_PARTICIPANT_KEY, false);
+ ((HostInterface) getActivity()).setConferenceDialButtonVisibility(true);
}
showDialpadChooser(needToShowDialpadChooser);
setStartedFromNewIntent(false);
@@ -1193,6 +1200,7 @@ public class DialpadFragment extends AnalyticsFragment
// must be dial conference add extra
intent.putExtra(TelephonyProperties.EXTRA_DIAL_CONFERENCE_URI, true);
}
+ intent.putExtra(ADD_PARTICIPANT_KEY, mAddParticipant);
DialerUtils.startActivityWithErrorToast(getActivity(), intent);
hideAndClearDialpad(false);
}