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

Commit 9315f8c1 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Move the SPA Lib framework code 

All framework code moved under framework package.

Bug: 235727273
Test: build
Change-Id: Ie227d1a827027ff2aaa56413b6ccfea8d6e387bc
parent fbfdf875

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

+4 −4
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ import androidx.compose.runtime.Composable 
import androidx.compose.ui.tooling.preview.Preview

import androidx.navigation.NavType

import androidx.navigation.navArgument

import com.android.settingslib.spa.api.SettingsPageProvider

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

import com.android.settingslib.spa.framework.toState

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

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

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

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

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

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

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

packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/HomePage.kt

+3 −3
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ import androidx.compose.runtime.Composable 
import androidx.compose.ui.Modifier

import androidx.compose.ui.res.stringResource

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

import com.android.settingslib.spa.api.SettingsPageProvider

import com.android.settingslib.spa.codelab.R

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

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

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

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

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



object HomePageProvider : SettingsPageProvider {

    override val name = Destinations.Home

packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/PageRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settingslib.spa.codelab.page



import com.android.settingslib.spa.api.SettingsPageRepository

import com.android.settingslib.spa.framework.api.SettingsPageRepository



object Destinations {

    const val Home = "Home"

packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/PreferencePage.kt

+4 −4
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ import androidx.compose.runtime.remember 
import androidx.compose.runtime.setValue

import androidx.compose.ui.Modifier

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

import com.android.settingslib.spa.api.SettingsPageProvider

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

import com.android.settingslib.spa.framework.toState

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

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

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

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

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

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

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

import kotlinx.coroutines.delay

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/SpaActivity.kt

+4 −3
Original line number Diff line number Diff line
@@ -24,9 +24,10 @@ import androidx.compose.runtime.CompositionLocalProvider 
import androidx.navigation.compose.NavHost

import androidx.navigation.compose.composable

import androidx.navigation.compose.rememberNavController

import com.android.settingslib.spa.api.SettingsPageProvider

import com.android.settingslib.spa.api.SettingsPageRepository

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

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

import com.android.settingslib.spa.framework.api.SettingsPageRepository

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

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



open class SpaActivity(

    private val settingsPageRepository: SettingsPageRepository,