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

Commit 4b2ed46b authored by Zekan Qian's avatar Zekan Qian
Browse files

Cleanup setIsAllowSearch in Gallery 

Bug: 244122804
Test: unit-test & local build gallery
Change-Id: I74a79a774559e1fa4dfc0b0893f8f1366ed9c84f
parent 0e8df402

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/button/ActionButtonsPage.kt

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ object ActionButtonPageProvider : SettingsPageProvider { 


    fun buildInjectEntry(): SettingsEntryBuilder {

        return SettingsEntryBuilder.createInject(owner = SettingsPage.create(name))

            .setIsAllowSearch(true)

            .setUiLayoutFn {

                Preference(object : PreferenceModel {

                    override val title = TITLE

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/dialog/AlterDialogPage.kt

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ object AlterDialogPageProvider : SettingsPageProvider { 
    )



    fun buildInjectEntry() = SettingsEntryBuilder.createInject(owner)

        .setIsAllowSearch(true)

        .setUiLayoutFn {

            Preference(object : PreferenceModel {

                override val title = TITLE

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/ArgumentPage.kt

+0 −4
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ object ArgumentPageProvider : SettingsPageProvider { 
        entryList.add(

            createEntry(owner, EntryEnum.STRING_PARAM)

                // Set attributes

                .setIsAllowSearch(true)

                .setIsSearchDataDynamic(true)

                .setSearchDataFn { ArgumentPageModel.genStringParamSearchData() }

                .setUiLayoutFn {
@@ -67,7 +66,6 @@ object ArgumentPageProvider : SettingsPageProvider { 
        entryList.add(

            createEntry(owner, EntryEnum.INT_PARAM)

                // Set attributes

                .setIsAllowSearch(true)

                .setIsSearchDataDynamic(true)

                .setSearchDataFn { ArgumentPageModel.genIntParamSearchData() }

                .setUiLayoutFn {
@@ -90,8 +88,6 @@ object ArgumentPageProvider : SettingsPageProvider { 
            owner = createSettingsPage(arguments),

            displayName = "${name}_$stringParam",

        )

            // Set attributes

            .setIsAllowSearch(false)

            .setSearchDataFn { ArgumentPageModel.genInjectSearchData() }

            .setUiLayoutFn {

                // Set ui rendering

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/ChartPage.kt

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ object ChartPageProvider : SettingsPageProvider { 


    fun buildInjectEntry(): SettingsEntryBuilder {

        return SettingsEntryBuilder.createInject(owner = SettingsPage.create(name))

            .setIsAllowSearch(true)

            .setUiLayoutFn {

                Preference(object : PreferenceModel {

                    override val title = TITLE

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/FooterPage.kt

+2 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.os.Bundle 
import androidx.compose.runtime.Composable

import androidx.compose.runtime.remember

import androidx.compose.ui.tooling.preview.Preview

import com.android.settingslib.spa.framework.common.EntrySearchData

import com.android.settingslib.spa.framework.common.SettingsEntry

import com.android.settingslib.spa.framework.common.SettingsEntryBuilder

import com.android.settingslib.spa.framework.common.SettingsPage
@@ -42,7 +43,7 @@ object FooterPageProvider : SettingsPageProvider { 
        val entryList = mutableListOf<SettingsEntry>()

        entryList.add(

            SettingsEntryBuilder.create( "Some Preference", owner)

                .setIsAllowSearch(true)

                .setSearchDataFn { EntrySearchData(title = "Some Preference") }

                .setUiLayoutFn {

                    Preference(remember {

                        object : PreferenceModel {
@@ -58,7 +59,6 @@ object FooterPageProvider : SettingsPageProvider { 


    fun buildInjectEntry(): SettingsEntryBuilder {

        return SettingsEntryBuilder.createInject(owner = SettingsPage.create(name))

            .setIsAllowSearch(true)

            .setUiLayoutFn {

                Preference(object : PreferenceModel {

                    override val title = TITLE