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

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199748

Change-Id: I712923c5e6374d1f274399a1d2bc2695c87553ba
This commit is contained in:
TreeHugger Robot
2021-04-19 08:06:47 +00:00
committed by Automerger Merge Worker
parent eeb6301479 d0ca25a062
commit dd44ac2630
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

@@ -2426,6 +2426,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" />

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

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

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

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