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

Commit edfbc2b0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I917e04f5,I832bb33f into main 

* changes:
  Migrate PreferencePageProvider
  Migrate gallery home page
parents 8db090e7 4d2cf1b1

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

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ import com.android.settingslib.spa.gallery.ui.SpinnerPageProvider 
 */

enum class SettingsPageProviderEnum(val displayName: String) {

    HOME("home"),

    PREFERENCE("preference"),



    // Add your SPPs

}

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

+6 −10
Original line number Diff line number Diff line
@@ -39,9 +39,7 @@ import androidx.compose.ui.Modifier 
import androidx.compose.ui.platform.LocalContext

import androidx.compose.ui.res.stringResource

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

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

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

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

import com.android.settingslib.spa.framework.compose.navigator

import com.android.settingslib.spa.framework.theme.SettingsDimension

import com.android.settingslib.spa.framework.theme.SettingsTheme
@@ -161,15 +159,13 @@ object BannerPageProvider : SettingsPageProvider { 
        }

    }



    fun buildInjectEntry(): SettingsEntryBuilder {

        return SettingsEntryBuilder.createInject(owner = createSettingsPage())

            .setUiLayoutFn {

    @Composable

    fun Entry() {

        Preference(object : PreferenceModel {

            override val title = TITLE

            override val onClick = navigator(name)

        })

    }

    }



    private const val TITLE = "Sample Banner"

}

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

+6 −10
Original line number Diff line number Diff line
@@ -23,9 +23,7 @@ import androidx.compose.material.icons.outlined.Delete 
import androidx.compose.material.icons.outlined.WarningAmber

import androidx.compose.runtime.Composable

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

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

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

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

import com.android.settingslib.spa.framework.compose.navigator

import com.android.settingslib.spa.framework.theme.SettingsTheme

import com.android.settingslib.spa.widget.button.ActionButton
@@ -55,16 +53,14 @@ object ActionButtonPageProvider : SettingsPageProvider { 
        }

    }



    fun buildInjectEntry(): SettingsEntryBuilder {

        return SettingsEntryBuilder.createInject(owner = createSettingsPage())

            .setUiLayoutFn {

    @Composable

    fun Entry() {

        Preference(object : PreferenceModel {

            override val title = TITLE

            override val onClick = navigator(name)

        })

    }

}

}



@Preview(showBackground = true)

@Composable

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

+7 −8
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import java.text.NumberFormat 
private enum class WeekDay(val num: Int) {

    Sun(0), Mon(1), Tue(2), Wed(3), Thu(4), Fri(5), Sat(6),

}



private const val TITLE = "Sample Chart"



object ChartPageProvider : SettingsPageProvider {
@@ -103,16 +104,14 @@ object ChartPageProvider : SettingsPageProvider { 
        return entryList

    }



    fun buildInjectEntry(): SettingsEntryBuilder {

        return SettingsEntryBuilder.createInject(owner)

            .setUiLayoutFn {

    @Composable

    fun Entry() {

        Preference(object : PreferenceModel {

            override val title = TITLE

            override val onClick = navigator(name)

        })

    }

}

}



@Preview(showBackground = true)

@Composable

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

+8 −7
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settingslib.spa.gallery.dialog 


import android.os.Bundle

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

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

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

import com.android.settingslib.spa.framework.common.SettingsPageProvider
@@ -55,8 +56,8 @@ object DialogMainPageProvider : SettingsPageProvider { 
        }.build(),

    )



    fun buildInjectEntry() = SettingsEntryBuilder.createInject(owner)

        .setUiLayoutFn {

    @Composable

    fun Entry() {

        Preference(object : PreferenceModel {

            override val title = TITLE

            override val onClick = navigator(name)