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

Commit 5bfb209a authored by Vineel Sadineni's avatar Vineel Sadineni Committed by Automerger Merge Worker
Browse files

Merge "Make MoreOptionsScope abstract class" into main am: 71e30e5c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2928195



Change-Id: Ib096454994698aee67df829037db053e4e090f9b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9fa20e10 71e30e5c

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 {