Better name for local account (1/2) (541743ce) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/editor/EditorUiUtils.java

+13 −16

Original line number	Diff line number	Diff line
		@@ -137,28 +137,25 @@ public class EditorUiUtils {
		public static Pair<String,String> getAccountInfo(Context context, String accountName,
		AccountType accountType) {
		CharSequence accountTypeDisplayLabel = accountType.getDisplayLabel(context);
		if (TextUtils.isEmpty(accountTypeDisplayLabel)) {
		if (TextUtils.isEmpty(accountTypeDisplayLabel)
		\|\| TextUtils.equals(
		context.getString(R.string.account_phone), accountTypeDisplayLabel)) {
		accountTypeDisplayLabel = context.getString(R.string.account_phone);
		} else if (GoogleAccountType.ACCOUNT_TYPE.equals(accountType.accountType)
		&& accountType.dataSet == null){
		accountTypeDisplayLabel = context.getString(R.string.google_account_type_format,
		accountTypeDisplayLabel);
		} else {
		accountTypeDisplayLabel = context.getString(R.string.account_type_format,
		accountTypeDisplayLabel);
		}

		if (TextUtils.isEmpty(accountName)) {
		return new Pair<>(
		/* accountName =*/ null,
		context.getString(R.string.account_type_format, accountTypeDisplayLabel));
		return new Pair<>(/* accountName */ null, accountTypeDisplayLabel.toString());
		}

		final String accountNameDisplayLabel =
		context.getString(R.string.from_account_format, accountName);

		if (GoogleAccountType.ACCOUNT_TYPE.equals(accountType.accountType)
		&& accountType.dataSet == null) {
		return new Pair<>(
		accountNameDisplayLabel,
		context.getString(R.string.google_account_type_format, accountTypeDisplayLabel));
		}
		return new Pair<>(
		accountNameDisplayLabel,
		context.getString(R.string.account_type_format, accountTypeDisplayLabel));
		return new Pair<>(context.getString(R.string.from_account_format, accountName),
		accountTypeDisplayLabel.toString());
		}

		/**

tests/src/com/android/contacts/editor/EditorUiUtilsTest.java

+10 −8

Original line number	Diff line number	Diff line
		@@ -119,10 +119,7 @@ public class EditorUiUtilsTest extends AndroidTestCase {
		assertNotNull(pair);
		assertEquals(getContext().getString(R.string.from_account_format, ACCOUNT_NAME),
		pair.first); // somebody@lunkedin.com
		assertEquals(
		getContext().getString(R.string.account_type_format,
		getContext().getString(R.string.account_phone)),
		pair.second); // "Phone-only, unsynced contact"
		assertEquals(getContext().getString(R.string.account_phone), pair.second); // Device
		}

		public void testGetAccountInfo_NoAccountName_DisplayLabel() {
		@@ -133,6 +130,14 @@ public class EditorUiUtilsTest extends AndroidTestCase {
		assertNull(pair.first);
		assertEquals(getContext().getString(R.string.account_type_format, DISPLAY_LABEL),
		pair.second); // LunkedIn contact

		final Pair pairDevice = EditorUiUtils.getAccountInfo(
		getContext(),
		/* accountName =*/ null,
		new MockAccountType(getContext().getString(R.string.account_phone)));
		assertNotNull(pairDevice);
		assertNull(pairDevice.first);
		assertEquals(getContext().getString(R.string.account_phone), pairDevice.second); // Device
		}

		public void testGetAccountInfo_NoAccountName_NoDisplayLabel() {
		@@ -141,10 +146,7 @@ public class EditorUiUtilsTest extends AndroidTestCase {

		assertNotNull(pair);
		assertNull(pair.first);
		assertEquals(
		getContext().getString(R.string.account_type_format,
		getContext().getString(R.string.account_phone)),
		pair.second); // "Phone-only, unsynced contact"
		assertEquals(getContext().getString(R.string.account_phone), pair.second); // Device
		}

		public void testGetRingtongStrFromUri_lessThanOrEqualsToM() {