PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply the correct style to Battery and Storage page

Browse Source 
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
This commit is contained in:
Mill Chen
2021-04-16 00:25:50 +08:00
parent 089c56520d
commit e545bff7da
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

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

3
src/com/android/settings/deviceinfo/StorageDashboardFragment.java
View File

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

3
src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
View File

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