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

Commit 18020da9 authored by Jacky Wang's avatar Jacky Wang Committed by Android (Google) Code Review
Browse files

Merge "[Catalyst] Introduce PreferenceLifecycleContext.lifecycleOwner" into main

parents 091119de c88ab56a

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

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import androidx.activity.result.ActivityResultCallback 
import androidx.activity.result.ActivityResultLauncher

import androidx.activity.result.contract.ActivityResultContract

import androidx.fragment.app.FragmentManager

import androidx.lifecycle.LifecycleOwner

import com.android.settingslib.datastore.KeyValueStore

import kotlinx.coroutines.CoroutineScope
@@ -247,6 +248,9 @@ interface PreferenceLifecycleProvider { 
 */

abstract class PreferenceLifecycleContext(context: Context) : ContextWrapper(context) {



    /** Returns the fragment [LifecycleOwner]. */

    abstract val lifecycleOwner: LifecycleOwner



    /**

     * [CoroutineScope] tied to the lifecycle, which is cancelled when the lifecycle is destroyed.

     *

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

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,9 @@ class PreferenceScreenBindingHelper( 


    internal val preferenceLifecycleContext =

        object : PreferenceLifecycleContext(fragment.requireContext()) {

            override val lifecycleOwner

                get() = fragment



            override val lifecycleScope

                get() = coroutineScope