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

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

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

Change-Id: I42bf2bfc4918f9a9388495b87e37137fc9324adb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-20 20:10:42 +00:00
committed by Automerger Merge Worker
parent a756df402f bc67d885ec
commit d5f6278e49
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/app_info_settings.xml
View File

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

2
src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt
View File

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

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

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