Merge "Update category for AccountDetailDashboardFragment." (1a1c3dd2) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accounts/UserAndAccountDashboardFragment.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -81,15 +81,6 @@ public class UserAndAccountDashboardFragment extends DashboardFragment {
		return controllers;
		}

		@Override
		protected boolean displayTile(Tile tile) {
		final Bundle metadata = tile.metaData;
		if (metadata != null) {
		return metadata.getString(METADATA_IA_ACCOUNT) == null;
		}
		return true;
		}

		private static class SummaryProvider implements SummaryLoader.SummaryProvider {

		private final Context mContext;

src/com/android/settings/dashboard/DashboardFragmentRegistry.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ public class DashboardFragmentRegistry {
		PARENT_TO_CATEGORY_KEY_MAP.put(SecuritySettings.class.getName(),
		CategoryKey.CATEGORY_SECURITY);
		PARENT_TO_CATEGORY_KEY_MAP.put(AccountDetailDashboardFragment.class.getName(),
		CategoryKey.CATEGORY_ACCOUNT);
		CategoryKey.CATEGORY_ACCOUNT_DETAIL);
		PARENT_TO_CATEGORY_KEY_MAP.put(UserAndAccountDashboardFragment.class.getName(),
		CategoryKey.CATEGORY_ACCOUNT);
		PARENT_TO_CATEGORY_KEY_MAP.put(

tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -74,16 +74,16 @@ public class AccountDetailDashboardFragmentTest {
		}

		@Test
		public void testCategory_isAccount() {
		public void testCategory_isAccountDetail() {
		assertThat(new AccountDetailDashboardFragment().getCategoryKey())
		.isEqualTo(CategoryKey.CATEGORY_ACCOUNT);
		.isEqualTo(CategoryKey.CATEGORY_ACCOUNT_DETAIL);
		}

		@Test
		public void refreshDashboardTiles_HasAccountType_shouldDisplay() {
		final Tile tile = new Tile();
		final Bundle metaData = new Bundle();
		metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT);
		metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT_DETAIL);
		metaData.putString(METADATA_ACCOUNT_TYPE, "com.abc");
		tile.metaData = metaData;

		@@ -94,7 +94,7 @@ public class AccountDetailDashboardFragmentTest {
		public void refreshDashboardTiles_NoAccountType_shouldNotDisplay() {
		final Tile tile = new Tile();
		final Bundle metaData = new Bundle();
		metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT);
		metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT_DETAIL);
		tile.metaData = metaData;

		assertThat(mFragment.displayTile(tile)).isFalse();
		@@ -104,7 +104,7 @@ public class AccountDetailDashboardFragmentTest {
		public void refreshDashboardTiles_OtherAccountType_shouldNotDisplay() {
		final Tile tile = new Tile();
		final Bundle metaData = new Bundle();
		metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT);
		metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT_DETAIL);
		metaData.putString(METADATA_ACCOUNT_TYPE, "com.other");
		tile.metaData = metaData;

tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java

+0 −21

Original line number	Diff line number	Diff line
		@@ -66,27 +66,6 @@ public class UserAndAccountDashboardFragmentTest {
		assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_ACCOUNT);
		}

		@Test
		public void refreshDashboardTiles_HasAccountType_shouldNotDisplay() {
		final Tile tile = new Tile();
		final Bundle metaData = new Bundle();
		metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT);
		metaData.putString(METADATA_ACCOUNT_TYPE, "com.abc");
		tile.metaData = metaData;

		assertThat(mFragment.displayTile(tile)).isFalse();
		}

		@Test
		public void refreshDashboardTiles_NoAccountType_shouldDisplay() {
		final Tile tile = new Tile();
		final Bundle metaData = new Bundle();
		metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT);
		tile.metaData = metaData;

		assertThat(mFragment.displayTile(tile)).isTrue();
		}

		@Test
		public void updateSummary_shouldDisplaySignedInUser() {
		final Activity activity = mock(Activity.class);