Merge "Apply the correct style to Battery and Storage page" into sc-dev

AndroidManifest.xml

@@ -2425,6 +2425,7 @@
 
         <activity android:name="Settings$ChooseAccountActivity"
             android:label="@string/header_add_an_account"
+                  android:theme="@style/Theme.SubSettings"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.accounts.ChooseAccountFragment" />

src/com/android/settings/deviceinfo/StorageDashboardFragment.java

@@ -336,8 +336,7 @@ public class StorageDashboardFragment extends DashboardFragment
         final Activity activity = getActivity();
         EntityHeaderController.newInstance(activity, this /*fragment*/,
                 null /* header view */)
-                .setRecyclerView(getListView(), getSettingsLifecycle())
-                .styleActionBar(activity);
+                .setRecyclerView(getListView(), getSettingsLifecycle());
     }
 
     @Override

src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java

@@ -105,8 +105,7 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
     @Override
     public void onStart() {
         EntityHeaderController.newInstance(mActivity, mHost, null /* header view */)
-                .setRecyclerView(mHost.getListView(), mLifecycle)
-                .styleActionBar(mActivity);
+                .setRecyclerView(mHost.getListView(), mLifecycle);
     }
 
     private CharSequence generateLabel(BatteryInfo info) {