Merge "Fix plus position in about phone" (c2b151d8) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,8 @@ import android.support.v7.preference.PreferenceScreen;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.text.BidiFormatter;
		import android.text.TextDirectionHeuristics;
		import android.text.TextUtils;

		import com.android.settings.R;
		@@ -120,7 +122,7 @@ public class PhoneNumberPreferenceController extends AbstractPreferenceControlle
		final String phoneNumber = DeviceInfoUtils.getFormattedPhoneNumber(mContext,
		subscriptionInfo);
		return TextUtils.isEmpty(phoneNumber) ? mContext.getString(R.string.device_info_default)
		: phoneNumber;
		: BidiFormatter.getInstance().unicodeWrap(phoneNumber, TextDirectionHeuristics.LTR);
		}

		@VisibleForTesting

+4 −1

Original line number	Diff line number	Diff line
		@@ -39,6 +39,8 @@ import android.telephony.SignalStrength;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.text.BidiFormatter;
		import android.text.TextDirectionHeuristics;
		import android.text.TextUtils;
		import android.util.Log;

		@@ -195,7 +197,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O

		private void updatePhoneNumber() {
		// If formattedNumber is null or empty, it'll display as "Unknown".
		mDialog.setText(PHONE_NUMBER_VALUE_ID, getPhoneNumber());
		mDialog.setText(PHONE_NUMBER_VALUE_ID, BidiFormatter.getInstance().unicodeWrap(
		getPhoneNumber(), TextDirectionHeuristics.LTR));
		}

		private void updateDataState(int state) {