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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-19 08:02:14 +00:00
committed by Android (Google) Code Review
parent 8b58ae9d4f e545bff7da
commit d0ca25a062
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) {