From b30ce6f7d719906d1624597f04fb3bd28bbf320a Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Wed, 14 Jun 2017 15:25:24 -0700 Subject: [PATCH] Update category for AccountDetailDashboardFragment. - use a separate category key for AccountDetailDashboardFragment instead of sharing the same key with UserAndAccountDashboardFragment. Tile using the original category will now show up at the top level account setting, and tile using the new account detail detail will be displayed under the specified account type. Bug: 62446202 Test: make RunSettingsRoboTests Change-Id: I06f781a20f24498bdc6207aef5469be9cd0c8e47 --- .../UserAndAccountDashboardFragment.java | 9 -------- .../dashboard/DashboardFragmentRegistry.java | 2 +- .../AccountDetailDashboardFragmentTest.java | 10 ++++----- .../UserAndAccountDashboardFragmentTest.java | 21 ------------------- 4 files changed, 6 insertions(+), 36 deletions(-) diff --git a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java index 792b77a6922..d8b19a1f2a2 100644 --- a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java +++ b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java @@ -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; diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java index f8525447b3e..7c8c8f16ccb 100644 --- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java +++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java @@ -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( diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java index 81b563f93e9..fb069175a7b 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java @@ -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; diff --git a/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java index d4a7a9d72b9..8c13aab993c 100644 --- a/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java @@ -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);