Rename app_details to entity_header

Bug: 37669238
Test: rerun robotests
Change-Id: Iab2cdf83d8b35ce3d45b0c413cad8614d44d5ed3
This commit is contained in:
Fan Zhang
2017-05-17 14:15:34 -07:00
parent 867c68e76c
commit 2ed0f99989
8 changed files with 17 additions and 17 deletions

View File

@@ -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;

View File

@@ -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 */);
}
}

View File

@@ -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(

View File

@@ -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