Merge branch 'main' into nav-cujs

Author: wardlauren

.github/workflows/apply_spotless.yml

@@ -50,6 +50,9 @@ jobs:
     - name: Run spotlessApply for Misc
       run: ./gradlew :misc:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
 
+    - name: Run spotlessApply for XR
+      run: ./gradlew :xr:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
+
     - name: Auto-commit if spotlessApply has changes
       uses: stefanzweifel/git-auto-commit-action@v5
       with:

.github/workflows/build.yml

@@ -47,3 +47,5 @@ jobs:
       run: ./gradlew :wear:build
     - name: Build misc snippets
       run: ./gradlew :misc:build
+    - name: Build XR snippets
+      run: ./gradlew :xr:build

gradle/libs.versions.toml

@@ -21,6 +21,7 @@ androidx-paging = "3.3.6"
 androidx-startup-runtime = "1.2.0"
 androidx-test = "1.6.1"
 androidx-test-espresso = "3.6.1"
+androidx-test-junit = "1.2.1"
 androidx-window = "1.4.0-rc01"
 androidx-window-core = "1.4.0-beta02"
 androidx-window-java = "1.3.0"
@@ -42,6 +43,8 @@ hilt = "2.55"
 horologist = "0.6.22"
 junit = "4.13.2"
 kotlin = "2.1.10"
+kotlinxCoroutinesGuava = "1.9.0"
+kotlinCoroutinesOkhttp = "1.0"
 kotlinxSerializationJson = "1.8.0"
 ksp = "2.1.10-1.0.30"
 maps-compose = "6.4.4"
@@ -55,13 +58,17 @@ playServicesWearable = "19.0.0"
 protolayout = "1.2.1"
 recyclerview = "1.4.0"
 # @keep
+androidx-xr = "1.0.0-alpha02"
 targetSdk = "34"
 tiles = "1.4.1"
 version-catalog-update = "0.8.5"
 wear = "1.3.0"
 wearComposeFoundation = "1.4.1"
 wearComposeMaterial = "1.4.1"
 wearToolingPreview = "1.0.0"
+activityKtx = "1.10.0"
+okHttp = "4.12.0"
+webkit = "1.13.0"
 
 [libraries]
 accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
@@ -125,6 +132,7 @@ androidx-startup-runtime = {module = "androidx.startup:startup-runtime", version
 androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
 androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
 androidx-test-runner = "androidx.test:runner:1.6.2"
+androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-junit" }
 androidx-tiles = { module = "androidx.wear.tiles:tiles", version.ref = "tiles" }
 androidx-tiles-renderer = { module = "androidx.wear.tiles:tiles-renderer", version.ref = "tiles" }
 androidx-tiles-testing = { module = "androidx.wear.tiles:tiles-testing", version.ref = "tiles" }
@@ -136,6 +144,9 @@ androidx-window = { module = "androidx.window:window", version.ref = "androidx-w
 androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window-core" }
 androidx-window-java = {module = "androidx.window:window-java", version.ref = "androidx-window-java" }
 androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.10.0"
+androidx-xr-arcore = { module = "androidx.xr.arcore:arcore", version.ref = "androidx-xr" }
+androidx-xr-compose = { module = "androidx.xr.compose:compose", version.ref = "androidx-xr" }
+androidx-xr-scenecore = { module = "androidx.xr.scenecore:scenecore", version.ref = "androidx-xr" }
 android-identity-googleid = {module = "com.google.android.libraries.identity.googleid:googleid", version.ref = "android-googleid"}
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
@@ -152,11 +163,16 @@ hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.re
 horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" }
 horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" }
 junit = { module = "junit:junit", version.ref = "junit" }
+kotlin-coroutines-okhttp = { module = "ru.gildor.coroutines:kotlin-coroutines-okhttp", version.ref = "kotlinCoroutinesOkhttp" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
+kotlinx-coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava", version.ref = "kotlinxCoroutinesGuava" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "playServicesWearable" }
+androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activityKtx" }
+okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okHttp" }
+androidx-webkit = { group = "androidx.webkit", name = "webkit", version.ref = "webkit" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }

identity/credentialmanager/build.gradle.kts

@@ -1,6 +1,8 @@
 plugins {
     alias(libs.plugins.android.application)
+    // [START android_identity_fido2_migration_dependency]
     alias(libs.plugins.kotlin.android)
+    // [END android_identity_fido2_migration_dependency]
     alias(libs.plugins.compose.compiler)
 }
 
@@ -48,6 +50,11 @@ dependencies {
     implementation(libs.androidx.compose.ui.graphics)
     implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.compose.material3)
+
+    // [START android_identity_credman_dependency]
+    implementation(libs.androidx.credentials)
+    // [END android_identity_credman_dependency]
+
     // [START android_identity_gradle_dependencies]
     implementation(libs.androidx.credentials)
 
@@ -60,6 +67,9 @@ dependencies {
     implementation(libs.androidx.credentials.play.services.auth)
     implementation(libs.android.identity.googleid)
     // [END android_identity_siwg_gradle_dependencies]
+    implementation(libs.okhttp)
+    implementation(libs.kotlin.coroutines.okhttp)
+    implementation(libs.androidx.webkit)
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.androidx.compose.ui.test.manifest)
-}
+}

identity/credentialmanager/src/main/AndroidManifest.xml

@@ -15,7 +15,8 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
@@ -38,6 +39,24 @@
         <!-- // [START android_identity_assetlinks_manifest] -->
         <meta-data android:name="asset_statements" android:resource="@string/asset_statements" />
         <!-- // [END android_identity_assetlinks_manifest] -->
+
+        <!-- // [START android_identity_credential_provider_service_manifest] -->
+        <service android:name=".MyCredentialProviderService"
+            android:enabled="true"
+            android:exported="true"
+            android:label="My Credential Provider"
+            android:icon="<any drawable icon>"
+            android:permission="android.permission.BIND_CREDENTIAL_PROVIDER_SERVICE"
+            tools:targetApi="upside_down_cake">
+            <intent-filter>
+                <action android:name="android.service.credentials.CredentialProviderService"/>
+            </intent-filter>
+            <meta-data
+                android:name="android.credentials.provider"
+                android:resource="@xml/provider"/>
+        </service>
+        <!-- // [END android_identity_credential_provider_service_manifest] -->
+
     </application>
 
-</manifest>
+</manifest>

identity/credentialmanager/src/main/java/com/example/identity/credentialmanager/CredentialManagerHandler.kt

@@ -0,0 +1,51 @@
+package com.example.identity.credentialmanager
+
+import android.app.Activity
+import android.util.Log
+import androidx.credentials.CreatePublicKeyCredentialRequest
+import androidx.credentials.CreatePublicKeyCredentialResponse
+import androidx.credentials.CredentialManager
+import androidx.credentials.GetCredentialRequest
+import androidx.credentials.GetCredentialResponse
+import androidx.credentials.GetPublicKeyCredentialOption
+import androidx.credentials.exceptions.CreateCredentialException
+import androidx.credentials.exceptions.GetCredentialException
+
+// This class is mostly copied from https://github.com/android/identity-samples/blob/main/WebView/CredentialManagerWebView/CredentialManagerHandler.kt.
+class CredentialManagerHandler(private val activity: Activity) {
+  private val mCredMan = CredentialManager.create(activity.applicationContext)
+  private val TAG = "CredentialManagerHandler"
+  /**
+   * Encapsulates the create passkey API for credential manager in a less error-prone manner.
+   *
+   * @param request a create public key credential request JSON required by [CreatePublicKeyCredentialRequest].
+   * @return [CreatePublicKeyCredentialResponse] containing the result of the credential creation.
+   */
+  suspend fun createPasskey(request: String): CreatePublicKeyCredentialResponse {
+    val createRequest = CreatePublicKeyCredentialRequest(request)
+    try {
+      return mCredMan.createCredential(activity, createRequest) as CreatePublicKeyCredentialResponse
+    } catch (e: CreateCredentialException) {
+      // For error handling use guidance from https://developer.android.com/training/sign-in/passkeys
+      Log.i(TAG, "Error creating credential: ErrMessage: ${e.errorMessage}, ErrType: ${e.type}")
+      throw e
+    }
+  }
+
+  /**
+   * Encapsulates the get passkey API for credential manager in a less error-prone manner.
+   *
+   * @param request a get public key credential request JSON required by [GetCredentialRequest].
+   * @return [GetCredentialResponse] containing the result of the credential retrieval.
+   */
+  suspend fun getPasskey(request: String): GetCredentialResponse {
+    val getRequest = GetCredentialRequest(listOf(GetPublicKeyCredentialOption(request, null)))
+    try {
+      return mCredMan.getCredential(activity, getRequest)
+    } catch (e: GetCredentialException) {
+      // For error handling use guidance from https://developer.android.com/training/sign-in/passkeys
+      Log.i(TAG, "Error retrieving credential: ${e.message}")
+      throw e
+    }
+  }
+}