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

Commit 1ca051f8 authored by Jason Chiu's avatar Jason Chiu
Browse files

[Catalyst] Add highlight menu and metrics keys for Network screens 

NO_IFTTT=Catalyst only

Bug: 409940414
Test: build
Flag: EXEMPT refactor
Change-Id: I7215bf6cce03e110e562201432482e35a27040fe
parent d38f51a2

src/com/android/settings/datausage/DataSaverScreen.kt

+9 −3
Original line number Diff line number Diff line
@@ -16,10 +16,12 @@ 


package com.android.settings.datausage



import android.app.settings.SettingsEnums

import android.content.Context

import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID

import com.android.settings.R

import com.android.settings.Settings.DataSaverSummaryActivity

import com.android.settings.core.PreferenceScreenMixin

import com.android.settings.datausage.DataSaverMainSwitchPreference.Companion.KEY as DATA_SAVER_KEY

import com.android.settings.flags.Flags

import com.android.settings.utils.makeLaunchIntent
@@ -32,11 +34,10 @@ import com.android.settingslib.metadata.PreferenceMetadata 
import com.android.settingslib.metadata.PreferenceSummaryProvider

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceScreenCreator



@ProvidePreferenceScreen(DataSaverScreen.KEY)

class DataSaverScreen(context: Context) :

    PreferenceScreenCreator,

open class DataSaverScreen(context: Context) :

    PreferenceScreenMixin,

    PreferenceAvailabilityProvider,

    PreferenceSummaryProvider,

    PreferenceLifecycleProvider {
@@ -67,6 +68,11 @@ class DataSaverScreen(context: Context) : 
    override fun isAvailable(context: Context) =

        context.resources.getBoolean(R.bool.config_show_data_saver)



    override val highlightMenuKey: Int

        get() = R.string.menu_key_network



    override fun getMetricsCategory() = SettingsEnums.DATA_SAVER_SUMMARY



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



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

src/com/android/settings/network/MobileNetworkListScreen.kt

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ import com.android.settingslib.metadata.PreferenceSummaryProvider 
import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceBinding

import com.android.settingslib.preference.PreferenceScreenCreator



@ProvidePreferenceScreen(MobileNetworkListScreen.KEY)

open class MobileNetworkListScreen :

src/com/android/settings/wifi/calling/WifiCallingScreen.kt

+9 −3
Original line number Diff line number Diff line
@@ -15,11 +15,13 @@ 
 */

package com.android.settings.wifi.calling



import android.app.settings.SettingsEnums

import android.content.Context

import android.os.Bundle

import android.telephony.SubscriptionManager.getDefaultSubscriptionId

import android.telephony.SubscriptionManager.isValidSubscriptionId

import com.android.settings.R

import com.android.settings.core.PreferenceScreenMixin

import com.android.settings.flags.Flags

import com.android.settings.network.SubscriptionUtil

import com.android.settings.network.telephony.wificalling.WifiCallingRepository
@@ -27,7 +29,6 @@ import com.android.settings.wifi.calling.WifiCallingSettingsForSub.EXTRA_SUB_ID 
import com.android.settingslib.metadata.PreferenceAvailabilityProvider

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceScreenCreator

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.asFlow

import kotlinx.coroutines.flow.filter
@@ -37,8 +38,8 @@ import kotlinx.coroutines.flow.map 
import kotlinx.coroutines.flow.merge



@ProvidePreferenceScreen(WifiCallingScreen.KEY, parameterized = true, parameterizedMigration = true)

class WifiCallingScreen(override val arguments: Bundle) :

    PreferenceScreenCreator, PreferenceAvailabilityProvider {

open class WifiCallingScreen(override val arguments: Bundle) :

    PreferenceScreenMixin, PreferenceAvailabilityProvider {



    private val subId = arguments.getInt(EXTRA_SUB_ID, getDefaultSubscriptionId())
@@ -51,6 +52,11 @@ class WifiCallingScreen(override val arguments: Bundle) : 
    override val summary: Int

        get() = R.string.wifi_calling_summary



    override val highlightMenuKey: Int

        get() = R.string.menu_key_network



    override fun getMetricsCategory() = SettingsEnums.WIFI_CALLING_FOR_SUB



    override fun isAvailable(context: Context) = isValidSubscriptionId(subId)



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