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

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

Merge "Update the proper App battery usage string on App info page" into udc-dev

parents ff65a02f 3be454f9

res/xml/app_info_settings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ 




    <Preference

    <Preference

        android:key="battery"

        android:key="battery"

        android:title="@string/app_battery_usage_title"

        android:title="@string/battery_details_title"

        android:summary="@string/summary_placeholder" />

        android:summary="@string/summary_placeholder" />





    <Preference

    <Preference

src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ fun AppBatteryPreference(app: ApplicationInfo) { 
    if (!presenter.isAvailable()) return

    if (!presenter.isAvailable()) return





    Preference(object : PreferenceModel {

    Preference(object : PreferenceModel {

        override val title = stringResource(R.string.app_battery_usage_title)

        override val title = stringResource(R.string.battery_details_title)

        override val summary = presenter.summary

        override val summary = presenter.summary

        override val enabled = presenter.enabled

        override val enabled = presenter.enabled

        override val onClick = presenter::startActivity

        override val onClick = presenter::startActivity

tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppBatteryPreferenceTest.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -101,7 +101,7 @@ class AppBatteryPreferenceTest { 




        setContent(notInstalledApp)

        setContent(notInstalledApp)





        composeTestRule.onNode(hasTextExactly(context.getString(R.string.app_battery_usage_title)))

        composeTestRule.onNode(hasTextExactly(context.getString(R.string.battery_details_title)))

            .assertIsDisplayed()

            .assertIsDisplayed()

            .assertIsNotEnabled()

            .assertIsNotEnabled()

    }

    }
@@ -114,7 +114,7 @@ class AppBatteryPreferenceTest { 




        composeTestRule.onNode(

        composeTestRule.onNode(

            hasTextExactly(

            hasTextExactly(

                context.getString(R.string.app_battery_usage_title),

                context.getString(R.string.battery_details_title),

                context.getString(R.string.no_battery_summary),

                context.getString(R.string.no_battery_summary),

            ),

            ),

        ).assertIsDisplayed().assertIsEnabled()

        ).assertIsDisplayed().assertIsEnabled()