From 2ed0f99989bf51b10e2276565b6b62c36de17e62 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 17 May 2017 14:15:34 -0700 Subject: [PATCH] Rename app_details to entity_header Bug: 37669238 Test: rerun robotests Change-Id: Iab2cdf83d8b35ce3d45b0c413cad8614d44d5ed3 --- ...details.xml => settings_entity_header.xml} | 0 ...tails_ia.xml => installed_app_details.xml} | 2 +- ...e_detail_ia.xml => power_usage_detail.xml} | 2 +- .../AccountDetailDashboardFragment.java | 4 ++-- .../applications/AppHeaderController.java | 2 +- .../applications/InstalledAppDetails.java | 2 +- .../fuelgauge/AdvancedPowerUsageDetail.java | 2 +- .../applications/AppHeaderControllerTest.java | 20 +++++++++---------- 8 files changed, 17 insertions(+), 17 deletions(-) rename res/layout/{app_details.xml => settings_entity_header.xml} (100%) rename res/xml/{installed_app_details_ia.xml => installed_app_details.xml} (97%) rename res/xml/{power_usage_detail_ia.xml => power_usage_detail.xml} (96%) diff --git a/res/layout/app_details.xml b/res/layout/settings_entity_header.xml similarity index 100% rename from res/layout/app_details.xml rename to res/layout/settings_entity_header.xml diff --git a/res/xml/installed_app_details_ia.xml b/res/xml/installed_app_details.xml similarity index 97% rename from res/xml/installed_app_details_ia.xml rename to res/xml/installed_app_details.xml index 5f8e8660587..12f044278a7 100644 --- a/res/xml/installed_app_details_ia.xml +++ b/res/xml/installed_app_details.xml @@ -19,7 +19,7 @@ diff --git a/res/xml/power_usage_detail_ia.xml b/res/xml/power_usage_detail.xml similarity index 96% rename from res/xml/power_usage_detail_ia.xml rename to res/xml/power_usage_detail.xml index 39e6c385d52..b7865d29002 100644 --- a/res/xml/power_usage_detail_ia.xml +++ b/res/xml/power_usage_detail.xml @@ -19,7 +19,7 @@ diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java index 65959b41e43..2e07abc20ae 100644 --- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java @@ -48,10 +48,10 @@ public class AccountDetailDashboardFragment extends DashboardFragment { public static final String KEY_ACCOUNT_HEADER = "account_header"; public static final String KEY_USER_HANDLE = "user_handle"; - @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + @VisibleForTesting Account mAccount; private String mAccountLabel; - @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + @VisibleForTesting String mAccountType; private AccountSyncPreferenceController mAccountSynController; private RemoveAccountPreferenceController mRemoveAccountController; diff --git a/src/com/android/settings/applications/AppHeaderController.java b/src/com/android/settings/applications/AppHeaderController.java index 804d645967a..c638d351f0e 100644 --- a/src/com/android/settings/applications/AppHeaderController.java +++ b/src/com/android/settings/applications/AppHeaderController.java @@ -93,7 +93,7 @@ public class AppHeaderController { mAppHeader = appHeader; } else { mAppHeader = LayoutInflater.from(fragment.getContext()) - .inflate(R.layout.app_details, null /* root */); + .inflate(R.layout.settings_entity_header, null /* root */); } } diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 6cc37e7769d..3b82b4cf1f8 100755 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -349,7 +349,7 @@ public class InstalledAppDetails extends AppInfoBase } setHasOptionsMenu(true); - addPreferencesFromResource(R.xml.installed_app_details_ia); + addPreferencesFromResource(R.xml.installed_app_details); addDynamicPrefs(); if (Utils.isBandwidthControlEnabled()) { INetworkStatsService statsService = INetworkStatsService.Stub.asInterface( diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index 7a2e4c09ce2..37e685dc6a6 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -224,7 +224,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements @Override protected int getPreferenceScreenResId() { - return R.xml.power_usage_detail_ia; + return R.xml.power_usage_detail; } @Override diff --git a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java index 8b9b4b46c32..2cdafe8fcf6 100644 --- a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java @@ -98,7 +98,7 @@ public class AppHeaderControllerTest { @Test public void testBuildView_constructedWithView_shouldReturnSameView() { - View inputView = mLayoutInflater.inflate(R.layout.app_details, null /* root */); + View inputView = mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */); mController = new AppHeaderController(mShadowContext, mFragment, inputView); View view = mController.done(mActivity); @@ -108,7 +108,7 @@ public class AppHeaderControllerTest { @Test public void bindViews_shouldBindAllData() { final String testString = "test"; - final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */); + final View appHeader = mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */); final TextView label = appHeader.findViewById(R.id.app_detail_title); final TextView version = appHeader.findViewById(R.id.app_detail_summary); @@ -129,7 +129,7 @@ public class AppHeaderControllerTest { info.activityInfo.packageName = "123"; info.activityInfo.name = "321"; final View appLinks = mLayoutInflater - .inflate(R.layout.app_details, null /* root */); + .inflate(R.layout.settings_entity_header, null /* root */); when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt())) .thenReturn(info); @@ -154,7 +154,7 @@ public class AppHeaderControllerTest { @Test public void bindButton_noAppPref_shouldNotShowButton() { final View appLinks = mLayoutInflater - .inflate(R.layout.app_details, null /* root */); + .inflate(R.layout.settings_entity_header, null /* root */); when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt())) .thenReturn(null); @@ -173,7 +173,7 @@ public class AppHeaderControllerTest { @Test public void bindButton_noAppInfo_shouldNotShowButton() { final View appLinks = mLayoutInflater - .inflate(R.layout.app_details, null /* root */); + .inflate(R.layout.settings_entity_header, null /* root */); mController = new AppHeaderController(mContext, mFragment, appLinks); mController.setPackageName(null) @@ -191,7 +191,7 @@ public class AppHeaderControllerTest { @Test public void bindButton_hasAppInfo_shouldShowButton() { final View appLinks = mLayoutInflater - .inflate(R.layout.app_details, null /* root */); + .inflate(R.layout.settings_entity_header, null /* root */); when(mFragment.getActivity()).thenReturn(mock(Activity.class)); mController = new AppHeaderController(mContext, mFragment, appLinks); @@ -211,7 +211,7 @@ public class AppHeaderControllerTest { @Test public void bindButton_hasAppInfo_shouldHaveContentDescription() { final View appLinks = mLayoutInflater - .inflate(R.layout.app_details, null /* root */); + .inflate(R.layout.settings_entity_header, null /* root */); when(mFragment.getActivity()).thenReturn(mock(Activity.class)); when(mContext.getString(eq(R.string.application_info_label))).thenReturn("App Info"); @@ -230,7 +230,7 @@ public class AppHeaderControllerTest { @Test public void bindButton_hasAppNotifIntent_shouldShowButton() { final View appLinks = mLayoutInflater - .inflate(R.layout.app_details, null /* root */); + .inflate(R.layout.settings_entity_header, null /* root */); mController = new AppHeaderController(mContext, mFragment, appLinks); mController.setAppNotifPrefIntent(new Intent()) @@ -249,7 +249,7 @@ public class AppHeaderControllerTest { // app is instant. @Test public void instantApps_normalAppsDontGetLabel() { - final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */); + final View appHeader = mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */); mController = new AppHeaderController(mContext, mFragment, appHeader); mController.done(mActivity); assertThat(appHeader.findViewById(R.id.install_type).getVisibility()) @@ -259,7 +259,7 @@ public class AppHeaderControllerTest { // Test that the "instant apps" label is present in the header when we have an instant app. @Test public void instantApps_expectedHeaderItem() { - final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */); + final View appHeader = mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */); mController = new AppHeaderController(mContext, mFragment, appHeader); mController.setIsInstantApp(true); mController.done(mActivity);