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

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

Merge "[Catalyst] Complement category hierarchy" into main

parents 55864923 0998325c

res/xml/power_usage_summary.xml

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

    </com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory>

    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="percentage_category">

        <SwitchPreferenceCompat

            android:key="status_bar_show_battery_percent"

            android:title="@string/battery_percentage"

src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreen.kt

+4 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import com.android.settings.display.BatteryPercentageSwitchPreference 
import com.android.settings.flags.Flags

import com.android.settings.fuelgauge.BatteryHeaderPreference

import com.android.settingslib.metadata.PreferenceAvailabilityProvider

import com.android.settingslib.metadata.PreferenceCategory

import com.android.settingslib.metadata.PreferenceIconProvider

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy
@@ -58,8 +59,10 @@ class PowerUsageSummaryScreen : 
    override fun getPreferenceHierarchy(context: Context) =

        preferenceHierarchy(context, this) {

            +BatteryHeaderPreference()

            +PreferenceCategory("percentage_category", 0) += {

                +BatteryPercentageSwitchPreference()

            }

        }



    companion object {

        const val KEY = "power_usage_summary_screen"