diff options
author | Anju Mathapati <anjucm@codeaurora.org> | 2013-06-03 16:53:50 -0700 |
---|---|---|
committer | Anju Mathapati <anjucm@codeaurora.org> | 2013-07-26 14:54:42 -0700 |
commit | 053a141e9ba608669af2ad1def32cb7568715ea7 (patch) | |
tree | 4cb1e50c9f825c5479d70df15fe2e74cbf47600f | |
parent | ff28db3a89f1470ebf8f322811283aa901f8a4c8 (diff) | |
download | android_packages_apps_Dialer-053a141e9ba608669af2ad1def32cb7568715ea7.tar.gz android_packages_apps_Dialer-053a141e9ba608669af2ad1def32cb7568715ea7.tar.bz2 android_packages_apps_Dialer-053a141e9ba608669af2ad1def32cb7568715ea7.zip |
IMS: Add Participant feature changes.
Includes-
- logic for bringing up dialpad
while adding participant
Change-Id: I415746ff1b6002cc5633a41715a290f0573f8782
CRs-fixed: 476229
-rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index 5494991cb..6ae58b359 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -195,6 +195,10 @@ public class DialpadFragment extends Fragment /** 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 @@ -239,8 +243,7 @@ public class DialpadFragment extends Fragment // Note that when there is on going call, add call should not show dial // conference button since normal dialpad should be used. // Check if ImsPhone is created, if so enable the conference button. - if (SystemProperties.getBoolean( - TelephonyProperties.CALLS_ON_IMS_ENABLED_PROPERTY, false)) { + if (isCallOnImsEnabled()) { // Note, phone app still need to check if UI option to "Use Ims Always" // is checked upon receiving dial request. mDialConferenceButton.setVisibility(View.VISIBLE); @@ -387,8 +390,7 @@ public class DialpadFragment extends Fragment } mDialConferenceButton = (ImageButton) fragmentView.findViewById(R.id.dialConferenceButton); - if(SystemProperties.getBoolean( - TelephonyProperties.CALLS_ON_IMS_ENABLED_PROPERTY, false)) { + if(isCallOnImsEnabled()) { if (mDialConferenceButton != null) { mDialConferenceButton.setOnClickListener(this); mDialConferenceButton.setOnLongClickListener(this); @@ -541,13 +543,26 @@ public class DialpadFragment extends Fragment } } else { - // for add call, show normal dialpad without dial conference button. - mDialConferenceButton.setVisibility(View.GONE); + mAddParticipant = intent.getBooleanExtra(ADD_PARTICIPANT_KEY, false); + if (isCallOnImsEnabled()) { + // for IMS AddParticipant feature add call, show normal + // dialpad with dial conference button. + mDialConferenceButton.setVisibility(View.VISIBLE); + } else { + // for add call, show normal dialpad without dial conference button. + mDialConferenceButton.setVisibility(View.GONE); + } } + Log.d(TAG,"mAddParticipant = " + mAddParticipant); showDialpadChooser(needToShowDialpadChooser); } + private boolean isCallOnImsEnabled() { + return (SystemProperties.getBoolean( + TelephonyProperties.CALLS_ON_IMS_ENABLED_PROPERTY, false)); + } + public void setStartedFromNewIntent(boolean value) { mStartedFromNewIntent = value; } @@ -1193,6 +1208,7 @@ public class DialpadFragment extends Fragment // must be dial conference add extra intent.putExtra(EXTRA_DIAL_CONFERENCE_URI, true); } + intent.putExtra(ADD_PARTICIPANT_KEY, mAddParticipant); startActivity(intent); mClearDigitsOnStop = true; getActivity().finish(); |