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

Commit 050a0329 authored by Fan Wu's avatar Fan Wu
Browse files

Add highlight and metric key for Battery screens 

Bug: 409940414
Test: atest
Flag: EXEMPT refactor
Change-Id: Ibda696a206853749aa71e756997a31fdbff363e0
parent fff4abbc

src/com/android/settings/fuelgauge/batterysaver/BatterySaverScreen.kt

+8 −2
Original line number Diff line number Diff line
@@ -15,18 +15,19 @@ 
 */

package com.android.settings.fuelgauge.batterysaver



import android.app.settings.SettingsEnums

import android.content.Context

import com.android.settings.R

import com.android.settings.Settings.BatterySaverSettingsActivity

import com.android.settings.core.PreferenceScreenMixin

import com.android.settings.flags.Flags

import com.android.settings.utils.makeLaunchIntent

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceScreenCreator



@ProvidePreferenceScreen(BatterySaverScreen.KEY)

open class BatterySaverScreen : PreferenceScreenCreator {

open class BatterySaverScreen : PreferenceScreenMixin {

    override val key: String

        get() = KEY
@@ -36,6 +37,11 @@ open class BatterySaverScreen : PreferenceScreenCreator { 
    override val keywords: Int

        get() = R.string.keywords_battery_saver



    override fun getMetricsCategory() = SettingsEnums.OPEN_BATTERY_SAVER



    override val highlightMenuKey

        get() = R.string.menu_key_battery



    override fun isFlagEnabled(context: Context) = Flags.catalystBatterySaverScreen()



    override fun fragmentClass() = BatterySaverSettings::class.java

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

+9 −4
Original line number Diff line number Diff line
@@ -15,23 +15,23 @@ 
 */

package com.android.settings.fuelgauge.batteryusage



import android.app.settings.SettingsEnums

import android.content.Context

import com.android.settings.R

import com.android.settings.core.PreferenceScreenMixin

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

import com.android.settingslib.preference.PreferenceScreenCreator

import com.android.settingslib.widget.SettingsThemeHelper.isExpressiveTheme

import com.android.settingslib.widget.UntitledPreferenceCategoryMetadata



@ProvidePreferenceScreen(PowerUsageSummaryScreen.KEY)

class PowerUsageSummaryScreen :

    PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceIconProvider {

open class PowerUsageSummaryScreen :

    PreferenceScreenMixin, PreferenceAvailabilityProvider, PreferenceIconProvider {

    override val key: String

        get() = KEY
@@ -41,6 +41,11 @@ class PowerUsageSummaryScreen : 
    override val keywords: Int

        get() = R.string.keywords_battery



    override fun getMetricsCategory() = SettingsEnums.FUELGAUGE_POWER_USAGE_SUMMARY_V2



    override val highlightMenuKey

        get() = R.string.menu_key_battery



    override fun isFlagEnabled(context: Context) = Flags.catalystPowerUsageSummaryScreen()



    override fun hasCompleteHierarchy() = false