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

Commit 9b62ec96 authored by Jacky Wang's avatar Jacky Wang
Browse files

Provide icon for catalyst screens 

Bug: 335132588
Flag: EXEMPT N/A
Test: Manual
Change-Id: I520529c3bf4a7db01889d08683f55b0efb21eae4
parent 2f80653a

src/com/android/settings/display/DisplayScreen.kt

+9 −1
Original line number Diff line number Diff line
@@ -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

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

+7 −3
Original line number Diff line number Diff line
@@ -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()

src/com/android/settings/notification/SoundScreen.kt

+8 −1
Original line number Diff line number Diff line
@@ -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