From e545bff7da867d872c92b74da0be431eef0e5939 Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Fri, 16 Apr 2021 00:25:50 +0800
Subject: [PATCH] Apply the correct style to Battery and Storage page

Since some pages were styling the action bar programmatically before, the
color of collapsing toolbar will be overridden. Removing them will fix
the problem with inconsist color. This change also fixed some pages with
inconsist theme.

Bug: 185444608
Test: visual verified
1) Settings -> Battery / Storage
2) Scrolling the collapsing toolbar and make it collapsed
3) Observe and see if the color of toolbar is different from the one of
status bar

Change-Id: I5e792747ea3f4deb05428ea5afe6a64f29f9da89
---
 AndroidManifest.xml                                            | 1 +
 .../android/settings/deviceinfo/StorageDashboardFragment.java  | 3 +--
 .../settings/fuelgauge/BatteryHeaderPreferenceController.java  | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8a5539b4466..4059b806a5f 100644
--- a/AndroidManifest.xml
+++ b/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" />
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index 03a7b970ff1..e7f5ba6e8b3 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/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
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 5a92f53a17d..e895e9a789b 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/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) {