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

Commit 47a47f3e authored by Carbo Kuo's avatar Carbo Kuo Committed by Android (Google) Code Review
Browse files

Merge "Fix typo "AlterDialog" in the SPA gallery app."

parents c574f5ca 7cee554c

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

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import com.android.settingslib.spa.framework.common.SettingsPageProviderReposito 
import com.android.settingslib.spa.framework.common.SpaEnvironment

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

import com.android.settingslib.spa.gallery.button.ActionButtonPageProvider

import com.android.settingslib.spa.gallery.dialog.AlterDialogPageProvider

import com.android.settingslib.spa.gallery.dialog.AlertDialogPageProvider

import com.android.settingslib.spa.gallery.home.HomePageProvider

import com.android.settingslib.spa.gallery.itemList.ItemListPageProvider

import com.android.settingslib.spa.gallery.itemList.ItemOperatePageProvider
@@ -80,7 +80,7 @@ class GallerySpaEnvironment(context: Context) : SpaEnvironment(context) { 
                ProgressBarPageProvider,

                LoadingBarPageProvider,

                ChartPageProvider,

                AlterDialogPageProvider,

                AlertDialogPageProvider,

                ItemListPageProvider,

                ItemOperatePageProvider,

                OperateListPageProvider,

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

+5 −5
Original line number Diff line number Diff line
@@ -28,14 +28,14 @@ import com.android.settingslib.spa.widget.dialog.rememberAlertDialogPresenter 
import com.android.settingslib.spa.widget.preference.Preference

import com.android.settingslib.spa.widget.preference.PreferenceModel



private const val TITLE = "AlterDialogPage"

private const val TITLE = "AlertDialogPage"



object AlterDialogPageProvider : SettingsPageProvider {

    override val name = "AlterDialogPage"

object AlertDialogPageProvider : SettingsPageProvider {

    override val name = "AlertDialogPage"

    private val owner = createSettingsPage()



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

        SettingsEntryBuilder.create("AlterDialog", owner).setUiLayoutFn {

        SettingsEntryBuilder.create("AlertDialog", owner).setUiLayoutFn {

            val alertDialogPresenter = rememberAlertDialogPresenter(

                confirmButton = AlertDialogButton("Ok"),

                dismissButton = AlertDialogButton("Cancel"),
@@ -43,7 +43,7 @@ object AlterDialogPageProvider : SettingsPageProvider { 
                text = { Text("Text") },

            )

            Preference(object : PreferenceModel {

                override val title = "Show AlterDialog"

                override val title = "Show AlertDialog"

                override val onClick = alertDialogPresenter::open

            })

        }.build(),

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/home/HomePage.kt

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.android.settingslib.spa.framework.theme.SettingsTheme 
import com.android.settingslib.spa.gallery.R

import com.android.settingslib.spa.gallery.SettingsPageProviderEnum

import com.android.settingslib.spa.gallery.button.ActionButtonPageProvider

import com.android.settingslib.spa.gallery.dialog.AlterDialogPageProvider

import com.android.settingslib.spa.gallery.dialog.AlertDialogPageProvider

import com.android.settingslib.spa.gallery.itemList.OperateListPageProvider

import com.android.settingslib.spa.gallery.page.ArgumentPageModel

import com.android.settingslib.spa.gallery.page.ArgumentPageProvider
@@ -64,7 +64,7 @@ object HomePageProvider : SettingsPageProvider { 
            ProgressBarPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),

            LoadingBarPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),

            ChartPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),

            AlterDialogPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),

            AlertDialogPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),

        )

    }