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

Commit 56b63b19 authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Clean up asyncPreferenceHierarchy 

Bug: 421105115
Flag: EXEMPT cleanup
Test: atest
Change-Id: I9e59338f916355a84a4984eb89389640c700ce00
parent 71253745

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

+1 −11
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class PreferenceHierarchy : PreferenceHierarchyNode { 
    /**

     * Children of the hierarchy.

     *

     * Each item be either [PreferenceHierarchyNode], [PreferenceHierarchy] or [Deferred] (async sub

     * Each item is either [PreferenceHierarchyNode], [PreferenceHierarchy] or [Deferred] (async sub

     * hierarchy).

     */

    private val children = mutableListOf<Any>()
@@ -397,13 +397,3 @@ fun PreferenceScreenMetadata.preferenceHierarchy( 
    context: Context,

    init: PreferenceHierarchy.() -> Unit,

) = PreferenceHierarchy(context, this).also(init)
 


/**

 * Builder function to create [PreferenceHierarchy] with coroutine in

 * [DSL](https://kotlinlang.org/docs/type-safe-builders.html) manner.

 */

suspend fun asyncPreferenceHierarchy(

    context: Context,

    metadata: PreferenceGroup,

    init: suspend PreferenceHierarchy.() -> Unit,

) = PreferenceHierarchy(context, metadata).also { init(it) }

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

+5 −1
Original line number Diff line number Diff line
@@ -122,7 +122,11 @@ interface PreferenceHierarchyGenerator<T> { 
    val defaultType: T



    /** Generates [PreferenceHierarchy] with given type. */

    suspend fun generatePreferenceHierarchy(context: Context, type: T): PreferenceHierarchy

    suspend fun generatePreferenceHierarchy(

        context: Context,

        coroutineScope: CoroutineScope,

        type: T,

    ): PreferenceHierarchy

}



/**

packages/SettingsLib/Preference/tests/AndroidManifest.xml

+6 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest package="com.android.settingslib.preference.test" />
 
<manifest xmlns:tools="http://schemas.android.com/tools"

    package="com.android.settingslib.preference.test">



    <!-- override temporarily to support running tests in Android Studio. -->

    <uses-sdk tools:overrideLibrary="platform_testing.libraries.flag.junit,android.frameworks.base" />

</manifest>