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

Merge "Update resource name and format previously added file" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-11-14 06:56:14 +00:00
committed by Android (Google) Code Review
parent f70d273de6 b551184b15
commit a869e573a0
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/power_usage_summary.xml
View File

@@ -59,7 +59,7 @@
settings:keywords="@string/keywords_battery_adaptive_preferences" /> settings:keywords="@string/keywords_battery_adaptive_preferences" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="battery_percentage" android:key="status_bar_show_battery_percent"
android:title="@string/battery_percentage" android:title="@string/battery_percentage"
android:summary="@string/battery_percentage_description" android:summary="@string/battery_percentage_description"
settings:controller="com.android.settings.display.BatteryPercentagePreferenceController" /> settings:controller="com.android.settings.display.BatteryPercentagePreferenceController" />

2
tests/robotests/src/com/android/settings/display/BatteryPercentageSwitchPreferenceTest.kt
View File

@@ -22,8 +22,6 @@ import android.provider.Settings
import androidx.preference.SwitchPreferenceCompat import androidx.preference.SwitchPreferenceCompat
import androidx.test.core.app.ApplicationProvider import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.accessibility.AccessibilityUtil.State.OFF
import com.android.settings.accessibility.AccessibilityUtil.State.ON
import com.android.settings.testutils.shadow.ShadowUtils import com.android.settings.testutils.shadow.ShadowUtils
import com.android.settingslib.preference.createAndBindWidget import com.android.settingslib.preference.createAndBindWidget
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat