Merge branch 'main' into update-focus

Author: chikoski

.github/workflows/build.yml

@@ -49,3 +49,5 @@ jobs:
       run: ./gradlew :misc:build
     - name: Build XR snippets
       run: ./gradlew :xr:build
+    - name: Build Watch Face Push validation snippets
+      run: ./gradlew :watchfacepush:validator:run 

gradle/libs.versions.toml

@@ -69,6 +69,7 @@ protolayout = "1.3.0"
 recyclerview = "1.4.0"
 targetSdk = "34"
 tiles = "1.5.0"
+validatorPush = "1.0.0-alpha03"
 version-catalog-update = "1.0.0"
 wear = "1.3.0"
 wearComposeFoundation = "1.5.0-beta04"
@@ -184,6 +185,7 @@ kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-t
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okHttp" }
 play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "playServicesWearable" }
+validator-push = { module = "com.google.android.wearable.watchface.validator:validator-push", version.ref = "validatorPush" }
 wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearComposeMaterial" }
 wear-compose-material3 = { module = "androidx.wear.compose:compose-material3", version.ref = "wearComposeMaterial3" }
 

gradlew

@@ -205,7 +205,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 # Collect all arguments for the java command:
 #   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#   * For validator: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \

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

@@ -26,7 +26,7 @@ class WebViewMainActivity : ComponentActivity() {
           settings.javaScriptEnabled = true
 
           // Test URL:
-          val url = "https://credman-web-test.glitch.me/"
+          val url = "https://passkeys-codelab.glitch.me/"
           val listenerSupported = WebViewFeature.isFeatureSupported(
             WebViewFeature.WEB_MESSAGE_LISTENER
           )

identity/credentialmanager/src/main/jsonSnippets.json

@@ -47,7 +47,7 @@
         "allowCredentials": [],
         "timeout": 1800000,
         "userVerification": "required",
-        "rpId": "credential-manager-app-test.glitch.me"
+        "rpId": "https://passkeys-codelab.glitch.me/"
       }
       // [END android_identity_format_json_request_passkey]
     },

misc/src/main/java/com/example/snippets/ActivityEmbeddingJavaSnippets.java

@@ -13,7 +13,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.OptIn;
-import androidx.annotation.RequiresApi;import androidx.appcompat.app.AppCompatActivity;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 import androidx.startup.Initializer;
 import androidx.window.WindowSdkExtensions;

settings.gradle.kts

@@ -14,7 +14,12 @@ dependencyResolutionManagement {
             println("https://androidx.dev/snapshots/builds/$it/artifacts/repository/")
             maven { url = uri("https://androidx.dev/snapshots/builds/$it/artifacts/repository/") }
         }
-
+        maven {
+            url = uri("https://jitpack.io")
+            content {
+                includeGroup("com.github.xgouchet")
+            }
+        }
         google()
         mavenCentral()
     }
@@ -30,4 +35,5 @@ include(
         ":misc",
         ":identity:credentialmanager",
         ":xr",
+        ":watchfacepush:validator"
 )

watchfacepush/validator/.gitignore

@@ -0,0 +1 @@
+/build

watchfacepush/validator/README.md

@@ -0,0 +1 @@
+This is a sample project that contains the code snippets seen on https://developer.android.com/training/wearables/watch-face-push

watchfacepush/validator/build.gradle.kts

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+group = "com.example.validator"
+version = "1.0"
+
+plugins {
+    kotlin("jvm")
+    application
+}
+
+application {
+    mainClass.set("com.example.validator.Main")
+}
+
+dependencies {
+    implementation(libs.validator.push)
+}