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

Commit d9fff4be authored by Zekan Qian's avatar Zekan Qian Committed by Android (Google) Code Review
Browse files

Merge "Add param name when use SettingsEntry.createInject api. Use... 

Merge "Add param name when use SettingsEntry.createInject api. Use SettingsPage.create api to create SettingsPage. Remove debug button in HOME page."
parents 03933264 6243eb3e

src/com/android/settings/spa/SpaEnvironment.kt

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ object SpaEnvironment { 
                AppListNotificationsPageProvider,

            ) + togglePermissionAppListTemplate.createPageProviders(),

            rootPages = listOf(

                SettingsPage(HomePageProvider.name),

                SettingsPage.create(HomePageProvider.name),

            ),

        )

    }

src/com/android/settings/spa/app/AppsMain.kt

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ object AppsMainPageProvider : SettingsPageProvider { 
    }



    fun buildInjectEntry() =

        SettingsEntryBuilder.createInject(SettingsPage.create(name)).setIsAllowSearch(false)

        SettingsEntryBuilder.createInject(owner = SettingsPage.create(name)).setIsAllowSearch(false)



    override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {

        val owner = SettingsPage.create(name, parameter, arguments)

src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ object SpecialAppAccessPageProvider : SettingsPageProvider { 
    }



    fun buildInjectEntry() =

        SettingsEntryBuilder.createInject(SettingsPage.create(name)).setIsAllowSearch(false)

        SettingsEntryBuilder.createInject(owner = SettingsPage.create(name)).setIsAllowSearch(false)



    override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {

        val owner = SettingsPage.create(name, parameter, arguments)

src/com/android/settings/spa/home/HomePage.kt

+0 −14
Original line number Diff line number Diff line
@@ -17,12 +17,9 @@ 
package com.android.settings.spa.home



import android.os.Bundle

import androidx.compose.material3.Button

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.ui.res.stringResource

import com.android.settings.R

import com.android.settings.spa.SpaEnvironment

import com.android.settings.spa.app.AppsMainPageProvider

import com.android.settings.spa.notification.NotificationMainPageProvider

import com.android.settingslib.spa.framework.common.SettingsEntry
@@ -51,16 +48,5 @@ private fun HomePage() { 
    HomeScaffold(title = stringResource(R.string.settings_label)) {

        AppsMainPageProvider.EntryItem()

        NotificationMainPageProvider.EntryItem()



        /**

         * A test button to generate hierarchy.

         * TODO: remove it once the content provider is ready.

         */

        Button(onClick = {

            SpaEnvironment.settingsEntryRepository.printAllPages()

            SpaEnvironment.settingsEntryRepository.printAllEntries()

        }) {

            Text(text = "Generate Entry")

        }

    }

}