Merge "IMS: Fix Conference URI button visibility issue." into atel.lnx.2.0-dev (49f407be) · Commits · e / os / android_packages_apps_Dialer

src/com/android/dialer/DialtactsActivity.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -1223,10 +1223,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
		setConferenceDialButtonImage(false);
		setConferenceDialButtonVisibility(true);
		boolean mIsRecipientsShown = mDialpadFragment.isRecipientsShown();
		if(mIsRecipientsShown) {
		mDialpadFragment.hideAndClearDialConference();
		}

		if (mIsDialpadShown \|\| mIsRecipientsShown) {
		if (TextUtils.isEmpty(mSearchQuery) \|\|
		(mSmartDialSearchFragment != null && mSmartDialSearchFragment.isVisible()

+10 −5

Original line number	Diff line number	Diff line
		@@ -654,6 +654,10 @@ public class DialpadFragment extends Fragment
		private void setFormattedDigits(String data, String normalizedNumber) {
		final String formatted = getFormattedDigits(data, normalizedNumber, mCurrentCountryIso);
		if (!TextUtils.isEmpty(formatted)) {
		if (isRecipientsShown()) {
		mRecipients.setText(formatted);
		afterTextChanged(mRecipients.getText());
		} else {
		Editable digits = mDigits.getText();
		digits.replace(0, digits.length(), formatted);
		// for some reason this isn't getting called in the digits.replace call above..
		@@ -661,6 +665,7 @@ public class DialpadFragment extends Fragment
		afterTextChanged(digits);
		}
		}
		}

		/**
		* Format the provided string of digits into one that represents a properly formatted phone