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

Commit 421ff1c4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Catalyst] Add PreferenceCategory metadata" into main

parents 7c66dfec 897c0e13

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

+6 −1
Original line number Original line Diff line number Diff line
@@ -175,7 +175,12 @@ interface PreferenceMetadata { 




/** Metadata of preference group. */

/** Metadata of preference group. */

@AnyThread

@AnyThread

open class PreferenceGroup(override val key: String, override val title: Int) : PreferenceMetadata

interface PreferenceGroup : PreferenceMetadata



/** Metadata of preference category. */

@AnyThread

open class PreferenceCategory(override val key: String, override val title: Int) :

    PreferenceGroup





/** Metadata of preference screen. */

/** Metadata of preference screen. */

@AnyThread

@AnyThread

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.settingslib.preference 




import androidx.preference.Preference

import androidx.preference.Preference

import com.android.settingslib.metadata.MainSwitchPreference

import com.android.settingslib.metadata.MainSwitchPreference

import com.android.settingslib.metadata.PreferenceGroup

import com.android.settingslib.metadata.PreferenceCategory

import com.android.settingslib.metadata.PreferenceHierarchyNode

import com.android.settingslib.metadata.PreferenceHierarchyNode

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.SwitchPreference

import com.android.settingslib.metadata.SwitchPreference
@@ -59,7 +59,7 @@ open class DefaultPreferenceBindingFactory : PreferenceBindingFactory { 
        metadata as? PreferenceBinding

        metadata as? PreferenceBinding

            ?: when (metadata) {

            ?: when (metadata) {

                is SwitchPreference -> SwitchPreferenceBinding.INSTANCE

                is SwitchPreference -> SwitchPreferenceBinding.INSTANCE

                is PreferenceGroup -> PreferenceGroupBinding.INSTANCE

                is PreferenceCategory -> PreferenceCategoryBinding.INSTANCE

                is PreferenceScreenCreator -> PreferenceScreenBinding.INSTANCE

                is PreferenceScreenCreator -> PreferenceScreenBinding.INSTANCE

                is MainSwitchPreference -> MainSwitchPreferenceBinding.INSTANCE

                is MainSwitchPreference -> MainSwitchPreferenceBinding.INSTANCE

                else -> DefaultPreferenceBinding

                else -> DefaultPreferenceBinding

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -55,13 +55,13 @@ interface PreferenceScreenBinding : PreferenceBinding { 
    }

    }

}

}





/** Binding of preference group associated with [PreferenceCategory]. */

/** Binding of preference category associated with [PreferenceCategory]. */

interface PreferenceGroupBinding : PreferenceBinding {

interface PreferenceCategoryBinding : PreferenceBinding {





    override fun createWidget(context: Context) = PreferenceCategory(context)

    override fun createWidget(context: Context) = PreferenceCategory(context)





    companion object {

    companion object {

        @JvmStatic val INSTANCE = object : PreferenceGroupBinding {}

        @JvmStatic val INSTANCE = object : PreferenceCategoryBinding {}

    }

    }

}

}