Merge "Rename app_details to entity_header"

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;

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

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(

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