From accc45eb185bf36af36299baafb4952bd000d8f8 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Mon, 20 Jan 2025 15:18:29 +0000 Subject: [PATCH] Add open source license display to Settings This change adds an option to display open source licenses within the settings screen by launching the `com.google.wear.ACTION_SHOW_LICENSE` intent. It also registers `OssLicensesMenuActivity` and `OssLicensesActivity` in the AndroidManifest. --- build.gradle.kts | 1 + gradle/libs.versions.toml | 4 ++++ media/sample/build.gradle.kts | 3 +++ media/sample/src/main/AndroidManifest.xml | 18 ++++++++++++++++++ .../ui/settings/UampSettingsScreen.kt | 16 ++++++++++++++++ media/sample/src/main/res/values/strings.xml | 1 + 6 files changed, 43 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 6a76e89023..47c04cd780 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,6 +36,7 @@ buildscript { classpath(libs.gradleMavenPublishPlugin) classpath(libs.dagger.hiltandroidplugin) + classpath(libs.oss.licenses.plugin) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8a71bdb09a..4e3af2ce43 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,6 +32,8 @@ appcompat = "1.7.0" com-squareup-okhttp3 = "5.0.0-alpha.14" com-squareup-retrofit2 = "2.11.0" compose-material3 = "1.3.1" +ossLicensesPlugin = "0.10.6" +playServicesOssLicenses = "17.1.0" wearComposeMaterial3 = "1.0.0-alpha31" composesnapshot = "-" dependencyAnalysis = "2.7.0" @@ -197,6 +199,8 @@ moshi-adapters = { module = "com.squareup.moshi:moshi-adapters", version.ref = " moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" } moshi-kotlin-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi" } okio = { module = "com.squareup.okio:okio", version.ref = "okio" } +oss-licenses-plugin = { module = "com.google.android.gms:oss-licenses-plugin", version.ref = "ossLicensesPlugin" } +play-services-oss-licenses = { module = "com.google.android.gms:play-services-oss-licenses", version.ref = "playServicesOssLicenses" } playservices-auth = { module = "com.google.android.gms:play-services-auth", version.ref = "playServicesAuth" } playservices-base = "com.google.android.gms:play-services-base:18.5.0" playservices-wearable = "com.google.android.gms:play-services-wearable:19.0.0" diff --git a/media/sample/build.gradle.kts b/media/sample/build.gradle.kts index 57b7278ffa..47e42ab3a8 100644 --- a/media/sample/build.gradle.kts +++ b/media/sample/build.gradle.kts @@ -26,6 +26,7 @@ plugins { kotlin("plugin.serialization") alias(libs.plugins.roborazzi) alias(libs.plugins.compose.compiler) + id("com.google.android.gms.oss-licenses-plugin") } val localProperties = Properties() @@ -247,6 +248,8 @@ dependencies { implementation(libs.playservices.auth) implementation(libs.kotlinx.coroutines.playservices) + implementation(libs.play.services.oss.licenses) + add("benchmarkImplementation", libs.androidx.runtime.tracing) debugImplementation(libs.compose.ui.tooling) diff --git a/media/sample/src/main/AndroidManifest.xml b/media/sample/src/main/AndroidManifest.xml index 1c8b173b3e..58770ce178 100644 --- a/media/sample/src/main/AndroidManifest.xml +++ b/media/sample/src/main/AndroidManifest.xml @@ -132,6 +132,24 @@ + + + + + + + Guest Mode Seen Login Details UAMP\n%1$s\n%2$s + App Licenses