PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Provide icon for catalyst screens" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-10-17 01:51:10 +00:00
committed by Android (Google) Code Review
parent 421bd753c4 9b62ec9616
commit 73742e3c34
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/display/DisplayScreen.kt
View File

@@ -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

10
src/com/android/settings/network/NetworkDashboardScreen.kt
View File

@@ -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()

9
src/com/android/settings/notification/SoundScreen.kt
View File

@@ -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