diff --git a/src/com/android/settings/display/DisplayScreen.kt b/src/com/android/settings/display/DisplayScreen.kt index 9886e4ae727..7b1d000d0dc 100644 --- a/src/com/android/settings/display/DisplayScreen.kt +++ b/src/com/android/settings/display/DisplayScreen.kt @@ -20,18 +20,26 @@ import com.android.settings.DisplaySettings import com.android.settings.R import com.android.settings.flags.Flags import com.android.settingslib.metadata.PreferenceAvailabilityProvider +import com.android.settingslib.metadata.PreferenceIconProvider import com.android.settingslib.metadata.ProvidePreferenceScreen import com.android.settingslib.metadata.preferenceHierarchy import com.android.settingslib.preference.PreferenceScreenCreator @ProvidePreferenceScreen -class DisplayScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider { +class DisplayScreen : + PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceIconProvider { override val key: String get() = KEY override val title: Int get() = R.string.display_settings + override fun getIcon(context: Context) = + when { + Flags.homepageRevamp() -> R.drawable.ic_settings_display_filled + else -> R.drawable.ic_settings_display_white + } + override fun isFlagEnabled(context: Context) = Flags.catalystDisplaySettingsScreen() override fun hasCompleteHierarchy() = false diff --git a/src/com/android/settings/network/NetworkDashboardScreen.kt b/src/com/android/settings/network/NetworkDashboardScreen.kt index dcdc37f386a..ad4ca41f251 100644 --- a/src/com/android/settings/network/NetworkDashboardScreen.kt +++ b/src/com/android/settings/network/NetworkDashboardScreen.kt @@ -18,20 +18,24 @@ package com.android.settings.network import android.content.Context import com.android.settings.R import com.android.settings.flags.Flags +import com.android.settingslib.metadata.PreferenceIconProvider import com.android.settingslib.metadata.ProvidePreferenceScreen import com.android.settingslib.metadata.preferenceHierarchy import com.android.settingslib.preference.PreferenceScreenCreator @ProvidePreferenceScreen -class NetworkDashboardScreen : PreferenceScreenCreator { +class NetworkDashboardScreen : PreferenceScreenCreator, PreferenceIconProvider { override val key: String get() = KEY override val title: Int get() = R.string.network_dashboard_title - override val icon: Int - get() = R.drawable.ic_settings_wireless_filled + override fun getIcon(context: Context) = + when { + Flags.homepageRevamp() -> R.drawable.ic_settings_wireless_filled + else -> R.drawable.ic_settings_wireless + } override fun isFlagEnabled(context: Context) = Flags.catalystNetworkProviderAndInternetScreen() diff --git a/src/com/android/settings/notification/SoundScreen.kt b/src/com/android/settings/notification/SoundScreen.kt index 300169d9c6d..6b6096794da 100644 --- a/src/com/android/settings/notification/SoundScreen.kt +++ b/src/com/android/settings/notification/SoundScreen.kt @@ -19,12 +19,13 @@ import android.content.Context import androidx.fragment.app.Fragment import com.android.settings.R import com.android.settings.flags.Flags +import com.android.settingslib.metadata.PreferenceIconProvider import com.android.settingslib.metadata.ProvidePreferenceScreen import com.android.settingslib.metadata.preferenceHierarchy import com.android.settingslib.preference.PreferenceScreenCreator @ProvidePreferenceScreen -class SoundScreen : PreferenceScreenCreator { +class SoundScreen : PreferenceScreenCreator, PreferenceIconProvider { override val key: String get() = KEY @@ -34,6 +35,12 @@ class SoundScreen : PreferenceScreenCreator { override val keywords: Int get() = R.string.keywords_sounds + override fun getIcon(context: Context) = + when { + Flags.homepageRevamp() -> R.drawable.ic_volume_up_filled + else -> R.drawable.ic_volume_up_24dp + } + override fun isFlagEnabled(context: Context): Boolean = Flags.catalystSoundScreen() override fun hasCompleteHierarchy() = false