Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0ca25a0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 8b58ae9d e545bff7

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −2
Original line number Diff line number Diff line
@@ -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

+1 −2
Original line number Diff line number Diff line
@@ -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) {