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

Commit bd268107 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

[Gallery] Move Sample Preference to sub page 

Will add more preferences later.

Also upgrade AGP version to 7.3.0-rc01, to work with Android Studio
Dolphin | 2021.3.1 RC 1

Bug: 235727273
Test: Manual with Gallery App
Change-Id: I426830ac698185c27362c1b7d48d076d7a30f3f2
parent d7027f52

packages/SettingsLib/Spa/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ buildscript { 
    }

}

plugins {

    id 'com.android.application' version '7.3.0-beta04' apply false

    id 'com.android.library' version '7.3.0-beta04' apply false

    id 'com.android.application' version '7.3.0-rc01' apply false

    id 'com.android.library' version '7.3.0-rc01' apply false

    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false

}

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

+4 −2
Original line number Diff line number Diff line
@@ -20,15 +20,17 @@ import com.android.settingslib.spa.framework.common.SettingsPageProviderReposito 
import com.android.settingslib.spa.gallery.home.HomePageProvider

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

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

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

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

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

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

import com.android.settingslib.spa.gallery.preference.PreferenceMainPageProvider

import com.android.settingslib.spa.gallery.preference.PreferencePageProvider

import com.android.settingslib.spa.gallery.preference.SwitchPreferencePageProvider

import com.android.settingslib.spa.gallery.ui.SpinnerPageProvider



val galleryPageProviders = SettingsPageProviderRepository(

    allPagesList = listOf(

        HomePageProvider,

        PreferenceMainPageProvider,

        PreferencePageProvider,

        SwitchPreferencePageProvider,

        ArgumentPageProvider,

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

+2 −4
Original line number Diff line number Diff line
@@ -25,10 +25,9 @@ import com.android.settingslib.spa.framework.theme.SettingsTheme 
import com.android.settingslib.spa.gallery.R

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

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

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

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

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

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

import com.android.settingslib.spa.gallery.preference.PreferenceMainPageProvider

import com.android.settingslib.spa.gallery.ui.SpinnerPageProvider

import com.android.settingslib.spa.widget.scaffold.HomeScaffold
@@ -44,8 +43,7 @@ object HomePageProvider : SettingsPageProvider { 
@Composable

private fun HomePage() {

    HomeScaffold(title = stringResource(R.string.app_name)) {

        PreferencePageProvider.EntryItem()

        SwitchPreferencePageProvider.EntryItem()

        PreferenceMainPageProvider.EntryItem()

        ArgumentPageProvider.EntryItem(stringParam = "foo", intParam = 0)



        SliderPageProvider.EntryItem()

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

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settingslib.spa.gallery.preference



import android.os.Bundle

import androidx.compose.runtime.Composable

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

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

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

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

import com.android.settingslib.spa.widget.scaffold.RegularScaffold



private const val TITLE = "Category: Preference"



object PreferenceMainPageProvider : SettingsPageProvider {

    override val name = "PreferenceMain"



    @Composable

    override fun Page(arguments: Bundle?) {

        PreferenceMain()

    }



    @Composable

    fun EntryItem() {

        Preference(object : PreferenceModel {

            override val title = TITLE

            override val onClick = navigator(name)

        })

    }

}



@Composable

private fun PreferenceMain() {

    RegularScaffold(title = TITLE) {

        PreferencePageProvider.EntryItem()

        SwitchPreferencePageProvider.EntryItem()

    }

}

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/PreferencePage.kt→packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/preference/PreferencePage.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settingslib.spa.gallery.page

package com.android.settingslib.spa.gallery.preference



import android.os.Bundle

import androidx.compose.material.icons.Icons