Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move the SPA Lib framework code"

Browse Source
This commit is contained in:
Chaohui Wang
2022-08-13 03:36:59 +00:00
committed by Android (Google) Code Review
parent 11bdf8e245 9315f8c1f8
commit 2b8cf2445e
17 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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

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

@@ -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"

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

@@ -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

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

@@ -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,

2
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/api/SettingsPageProvider.kt → packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/api/SettingsPageProvider.kt
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.api
package com.android.settingslib.spa.framework.api
import android.os.Bundle
import androidx.compose.runtime.Composable

2
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/api/SettingsPageRepository.kt → packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/api/SettingsPageRepository.kt
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.api
package com.android.settingslib.spa.framework.api
data class SettingsPageRepository(
val allPages: List<SettingsPageProvider>,

2
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/NavControllerWrapper.kt → packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/compose/NavControllerWrapper.kt
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.framework
package com.android.settingslib.spa.framework.compose
import androidx.compose.runtime.Composable
import androidx.compose.runtime.compositionLocalOf

2
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/RuntimeUtils.kt → packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/compose/RuntimeUtils.kt
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.framework
package com.android.settingslib.spa.framework.compose
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State

2
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/theme/MaterialColors.kt → packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/MaterialColors.kt
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.theme
package com.android.settingslib.spa.framework.theme
import androidx.compose.material3.ColorScheme
import androidx.compose.material3.dynamicDarkColorScheme

2
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/theme/SettingsDimension.kt → packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsDimension.kt
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.theme
package com.android.settingslib.spa.framework.theme
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.ui.unit.dp

2
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/theme/SettingsOpacity.kt → packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsOpacity.kt
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.theme
package com.android.settingslib.spa.framework.theme
object SettingsOpacity {
const val Full = 1f

2
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/theme/SettingsTheme.kt → packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsTheme.kt
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settingslib.spa.theme
package com.android.settingslib.spa.framework.theme
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme

8
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/BaseLayout.kt
View File

@@ -35,10 +35,10 @@ import androidx.compose.ui.draw.alpha
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.android.settingslib.spa.framework.toState
import com.android.settingslib.spa.theme.SettingsDimension
import com.android.settingslib.spa.theme.SettingsOpacity
import com.android.settingslib.spa.theme.SettingsTheme
import com.android.settingslib.spa.framework.compose.toState
import com.android.settingslib.spa.framework.theme.SettingsDimension
import com.android.settingslib.spa.framework.theme.SettingsOpacity
import com.android.settingslib.spa.framework.theme.SettingsTheme
@Composable
internal fun BaseLayout(

6
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/BasePreference.kt
View File

@@ -26,9 +26,9 @@ import androidx.compose.runtime.State
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import com.android.settingslib.spa.framework.toState
import com.android.settingslib.spa.theme.SettingsDimension
import com.android.settingslib.spa.theme.SettingsTheme
import com.android.settingslib.spa.framework.compose.toState
import com.android.settingslib.spa.framework.theme.SettingsDimension
import com.android.settingslib.spa.framework.theme.SettingsTheme
@Composable
internal fun BasePreference(

2
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/Preference.kt
View File

@@ -20,7 +20,7 @@ import androidx.compose.foundation.clickable
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State
import androidx.compose.ui.Modifier
import com.android.settingslib.spa.framework.stateOf
import com.android.settingslib.spa.framework.compose.stateOf
/**
* The widget model for [Preference] widget.

2
packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/widget/preference/PreferenceTest.kt
View File

@@ -26,7 +26,7 @@ import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settingslib.spa.framework.toState
import com.android.settingslib.spa.framework.compose.toState
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith