Merge branch 'LA.BF64.1.2.2_rb4.7' of... (412dd31e) · Commits · e / os / android_packages_apps_Dialer

res/menu/dialpad_options.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,10 @@
		-->
		<menu xmlns:android="http://schemas.android.com/apk/res/android">

		<item
		android:id="@+id/menu_add_to_4g_conference_call"
		android:title="@string/menu_add_to_4g_conference_call"
		android:showAsAction="withText" />
		<item
		android:id="@+id/menu_2s_pause"
		android:title="@string/add_2sec_pause"

+3 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,9 @@
		-->
		<menu xmlns:android="http://schemas.android.com/apk/res/android">

		<item
		android:id="@+id/menu_4g_conference_call"
		android:title="@string/menu_4g_conference_call" />
		<item
		android:id="@+id/menu_history"
		android:icon="@drawable/ic_menu_history_lt"

+2 −0

Original line number	Diff line number	Diff line
		@@ -266,6 +266,8 @@
		<string name="menu_show_all_calls">Show all calls</string>

		<!-- Menu items for dialpad options as part of Pause and Wait ftr [CHAR LIMIT=30] -->
		<string name="menu_add_to_4g_conference_call">Add to 4G conference call</string>
		<string name="menu_4g_conference_call">4G conference call</string>
		<string name="add_2sec_pause">Add 2-sec pause</string>
		<string name="add_wait">Add wait</string>

+6 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ import android.widget.ImageButton;
		import android.widget.PopupMenu;
		import android.widget.Toast;

		import com.android.contacts.common.CallUtil;
		import com.android.contacts.common.activity.TransactionSafeActivity;
		import com.android.contacts.common.dialog.ClearFrequentsDialog;
		import com.android.contacts.common.interactions.ImportExportDialogFragment;
		@@ -271,6 +272,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O

		menu.findItem(R.id.menu_history).setVisible(
		PermissionsUtil.hasPhonePermissions(DialtactsActivity.this));
		final MenuItem ConferDialerOption = menu.findItem(R.id.menu_4g_conference_call);
		ConferDialerOption.setVisible(CallUtil.isConferDialerEnabled(getApplicationContext()));
		super.show();
		}
		}
		@@ -674,6 +677,9 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
		@Override
		public boolean onMenuItemClick(MenuItem item) {
		switch (item.getItemId()) {
		case R.id.menu_4g_conference_call:
		this.startActivity(CallUtil.getConferenceDialerIntent(null));
		break;
		case R.id.menu_history:
		// Use explicit CallLogActivity intent instead of ACTION_VIEW +
		// CONTENT_TYPE, so that we always open our call log from our dialer

+10 −2

Original line number	Diff line number	Diff line
		@@ -923,6 +923,10 @@ public class DialpadFragment extends Fragment
		public void show() {
		final Menu menu = getMenu();

		final MenuItem ConferDialerOption
		= menu.findItem(R.id.menu_add_to_4g_conference_call);
		ConferDialerOption.setVisible(CallUtil.isConferDialerEnabled(getActivity()));

		boolean enable = !isDigitsEmpty();
		for (int i = 0; i < menu.size(); i++) {
		MenuItem item = menu.getItem(i);
		@@ -1209,8 +1213,8 @@ public class DialpadFragment extends Fragment
		mRecipients.getText().toString().trim();
		if (isDigitsShown && isDigitsEmpty()) {
		handleDialButtonClickWithEmptyDigits();
		} else if (mAddParticipant && isDigitsEmpty() && mRecipients.isShown()
		&& isRecipientEmpty()) {
		} else if (mAddParticipant && isPhoneInUse() && isDigitsEmpty()
		&& mRecipients.isShown() && isRecipientEmpty()) {
		// mRecipients must be empty
		// TODO add support for conference URI in last number dialed
		// use ErrorDialogFragment instead? also see
		@@ -1597,6 +1601,10 @@ public class DialpadFragment extends Fragment
		CallSubjectDialog.start(getActivity(), mDigits.getText().toString());
		hideAndClearDialpad(false);
		return true;
		case R.id.menu_add_to_4g_conference_call:
		getActivity().startActivity(CallUtil.getConferenceDialerIntent(
		mDigits.getText().toString()));
		return true;
		default:
		return false;
		}