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

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

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

parents f70d273d b551184b

res/xml/power_usage_summary.xml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
        settings:keywords="@string/keywords_battery_adaptive_preferences" />



    <SwitchPreferenceCompat

        android:key="battery_percentage"

        android:key="status_bar_show_battery_percent"

        android:title="@string/battery_percentage"

        android:summary="@string/battery_percentage_description"

        settings:controller="com.android.settings.display.BatteryPercentagePreferenceController" />

tests/robotests/src/com/android/settings/display/BatteryPercentageSwitchPreferenceTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import android.provider.Settings 
import androidx.preference.SwitchPreferenceCompat

import androidx.test.core.app.ApplicationProvider

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.settingslib.preference.createAndBindWidget

import com.google.common.truth.Truth.assertThat