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

Commit d5979527 authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Move getPreferenceIcon out of PreferenceMetadata 

Bug: 388167106
Flag: EXEMPT refactor
Test: atest
Change-Id: If6d634310c4c7638b36b6c02db78cb6af7792f01
parent 5aa8cbf3

packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import com.android.settingslib.metadata.PreferenceTitleProvider 
import com.android.settingslib.metadata.ReadWritePermit

import com.android.settingslib.metadata.SensitivityLevel.Companion.HIGH_SENSITIVITY

import com.android.settingslib.metadata.SensitivityLevel.Companion.UNKNOWN_SENSITIVITY

import com.android.settingslib.metadata.getPreferenceIcon

import com.android.settingslib.preference.PreferenceScreenFactory

import com.android.settingslib.preference.PreferenceScreenProvider

import java.util.Locale

packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceMetadata.kt

+0 −13
Original line number Diff line number Diff line
@@ -149,19 +149,6 @@ interface PreferenceMetadata { 
            this is PreferenceTitleProvider -> getTitle(context)

            else -> null

        }



    /**

     * Returns the preference icon.

     *

     * Implement [PreferenceIconProvider] interface if icon is provided dynamically (e.g. icon is

     * provided based on flag value).

     */

    fun getPreferenceIcon(context: Context): Int =

        when {

            icon != 0 -> icon

            this is PreferenceIconProvider -> getIcon(context)

            else -> 0

        }

}



/** Metadata of preference group. */

packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/Utils.kt

+8 −0
Original line number Diff line number Diff line
@@ -25,3 +25,11 @@ fun PreferenceMetadata.getPreferenceSummary(context: Context): CharSequence? = 
        this is PreferenceSummaryProvider -> getSummary(context)

        else -> null

    }



/** Returns the preference icon. */

fun PreferenceMetadata.getPreferenceIcon(context: Context): Int =

    when {

        icon != 0 -> icon

        this is PreferenceIconProvider -> getIcon(context)

        else -> 0

    }

packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.settingslib.metadata.IntRangeValuePreference 
import com.android.settingslib.metadata.PreferenceAvailabilityProvider

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.PreferenceScreenMetadata

import com.android.settingslib.metadata.getPreferenceIcon

import com.android.settingslib.metadata.getPreferenceSummary



/** Binding of preference widget and preference metadata. */