diff options
10 files changed, 33 insertions, 27 deletions
diff --git a/packages/SettingsLib/Spa/gradle/libs.versions.toml b/packages/SettingsLib/Spa/gradle/libs.versions.toml index 0f467b9c3386..8b563362a77b 100644 --- a/packages/SettingsLib/Spa/gradle/libs.versions.toml +++ b/packages/SettingsLib/Spa/gradle/libs.versions.toml @@ -15,7 +15,7 @@ # [versions] -agp = "8.1.0" +agp = "8.1.1" compose-compiler = "1.5.1" dexmaker-mockito = "2.28.3" kotlin = "1.9.0" diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.jar b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.jar Binary files differindex c1962a79e29d..033e24c4cdf4 100644 --- a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.jar +++ b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.jar diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties index 5b0ac44eb772..da04f426c68f 100644 --- a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties +++ b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties @@ -16,6 +16,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/SettingsLib/Spa/gradlew b/packages/SettingsLib/Spa/gradlew index aeb74cbb43e3..fcb6fca147c0 100755 --- a/packages/SettingsLib/Spa/gradlew +++ b/packages/SettingsLib/Spa/gradlew @@ -130,10 +130,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. diff --git a/packages/SettingsLib/Spa/spa/build.gradle.kts b/packages/SettingsLib/Spa/spa/build.gradle.kts index 84198ded7253..b8105113af7b 100644 --- a/packages/SettingsLib/Spa/spa/build.gradle.kts +++ b/packages/SettingsLib/Spa/spa/build.gradle.kts @@ -63,7 +63,7 @@ dependencies { api("androidx.compose.ui:ui-tooling-preview:$jetpackComposeVersion") api("androidx.lifecycle:lifecycle-livedata-ktx") api("androidx.lifecycle:lifecycle-runtime-compose") - api("androidx.navigation:navigation-compose:2.7.0-rc01") + api("androidx.navigation:navigation-compose:2.7.1") api("com.github.PhilJay:MPAndroidChart:v3.1.0-alpha") api("com.google.android.material:material:1.7.0-alpha03") debugApi("androidx.compose.ui:ui-tooling:$jetpackComposeVersion") diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsEntryBuilder.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsEntryBuilder.kt index 97d8de3c5fcf..0d489e895017 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsEntryBuilder.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsEntryBuilder.kt @@ -147,19 +147,20 @@ class SettingsEntryBuilder(private val name: String, private val owner: Settings return create(entryName, owner).setLink(toPage = owner) } - fun create(owner: SettingsPage, entryName: String, label: String? = null): - SettingsEntryBuilder { - return SettingsEntryBuilder(entryName, owner).setLabel(label ?: entryName) - } - - fun createInject(owner: SettingsPage, label: String? = null): SettingsEntryBuilder { - val label = label ?: "${INJECT_ENTRY_LABEL}_${owner.displayName}" - return createLinkTo(INJECT_ENTRY_LABEL, owner).setLabel(label) - } - - fun createRoot(owner: SettingsPage, label: String? = null): SettingsEntryBuilder { - val label = label ?: "${ROOT_ENTRY_LABEL}_${owner.displayName}" - return createLinkTo(ROOT_ENTRY_LABEL, owner).setLabel(label) - } + fun create( + owner: SettingsPage, + entryName: String, + label: String = entryName, + ): SettingsEntryBuilder = SettingsEntryBuilder(entryName, owner).setLabel(label) + + fun createInject( + owner: SettingsPage, + label: String = "${INJECT_ENTRY_LABEL}_${owner.displayName}", + ): SettingsEntryBuilder = createLinkTo(INJECT_ENTRY_LABEL, owner).setLabel(label) + + fun createRoot( + owner: SettingsPage, + label: String = "${ROOT_ENTRY_LABEL}_${owner.displayName}", + ): SettingsEntryBuilder = createLinkTo(ROOT_ENTRY_LABEL, owner).setLabel(label) } } diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/slice/SpaSliceProvider.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/slice/SpaSliceProvider.kt index b809c0f1ae63..3496f02a70e4 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/slice/SpaSliceProvider.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/slice/SpaSliceProvider.kt @@ -64,8 +64,8 @@ class SpaSliceProvider : SliceProvider(), Observer<Slice?> { } } - override fun onChanged(slice: Slice?) { - val uri = slice?.uri ?: return + override fun onChanged(value: Slice?) { + val uri = value?.uri ?: return Log.d(TAG, "onChanged: $uri") context?.contentResolver?.notifyChange(uri, null) } @@ -74,4 +74,4 @@ class SpaSliceProvider : SliceProvider(), Observer<Slice?> { Log.d(TAG, "onCreateSliceProvider") return true } -}
\ No newline at end of file +} diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/slice/presenter/Demo.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/slice/presenter/Demo.kt index cff1c0c619c4..ee24a09d4395 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/slice/presenter/Demo.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/slice/presenter/Demo.kt @@ -17,7 +17,7 @@ package com.android.settingslib.spa.slice.presenter import android.net.Uri -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext @@ -34,7 +34,7 @@ fun SliceDemo(sliceUri: Uri) { SliceLiveData.fromUri(context, sliceUri) } - Divider() + HorizontalDivider() AndroidView( factory = { localContext -> val view = SliceView(localContext) diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/BaseLayout.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/BaseLayout.kt index 6135203ec703..6330ddf5bea4 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/BaseLayout.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/BaseLayout.kt @@ -24,7 +24,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.ui.Alignment @@ -105,7 +105,7 @@ private fun BaseLayoutPreview() { BaseLayout( title = "Title", subTitle = { - Divider(thickness = 10.dp) + HorizontalDivider(thickness = 10.dp) } ) } diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SearchScaffold.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SearchScaffold.kt index 67f4418b7e4c..d437e3579354 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SearchScaffold.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SearchScaffold.kt @@ -99,8 +99,8 @@ fun SearchScaffold( .fillMaxSize(), ) { content( - bottomPadding = paddingValues.calculateBottomPadding(), - searchQuery = remember { + paddingValues.calculateBottomPadding(), + remember { derivedStateOf { if (isSearchMode) viewModel.searchQuery.text else "" } }, ) |