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

Commit 6122227f authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Make MoreOptionsScope abstract class" into main

parents 2f99a37d a517f66c

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/MoreOptions.kt

+3 −3
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ import androidx.compose.ui.res.stringResource 
/**

 * Scope for the children of [MoreOptionsAction].

 */

interface MoreOptionsScope {

    fun dismiss()

abstract class MoreOptionsScope {

    abstract fun dismiss()



    @Composable

    fun MenuItem(text: String, enabled: Boolean = true, onClick: () -> Unit) {
@@ -60,7 +60,7 @@ fun MoreOptionsAction( 
    val onDismiss = { expanded = false }

    DropdownMenu(expanded = expanded, onDismissRequest = onDismiss) {

        val moreOptionsScope = remember(this) {

            object : MoreOptionsScope {

            object : MoreOptionsScope() {

                override fun dismiss() {

                    onDismiss()

                }

packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/template/scaffold/RestrictedMenuItemTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ class RestrictedMenuItemTest { 
    }



    private fun setContent(restrictions: Restrictions) {

        val fakeMoreOptionsScope = object : MoreOptionsScope {

        val fakeMoreOptionsScope = object : MoreOptionsScope() {

            override fun dismiss() {}

        }

        composeTestRule.setContent {