Merge "Add simple M3 Tile" into m3

Author: ithinkihaveacat

gradle/libs.versions.toml

@@ -45,11 +45,11 @@ media3 = "1.5.1"
 # @keep
 minSdk = "21"
 playServicesWearable = "19.0.0"
-protolayout = "1.2.1"
+protolayout = "1.3.0-beta01"
 recyclerview = "1.4.0"
 # @keep
 targetSdk = "34"
-tiles = "1.4.1"
+tiles = "1.5.0-beta01"
 version-catalog-update = "0.8.5"
 wear = "1.3.0"
 wearComposeFoundation = "1.4.1"
@@ -112,6 +112,7 @@ androidx-paging-compose = { module = "androidx.paging:paging-compose", version.r
 androidx-protolayout = { module = "androidx.wear.protolayout:protolayout", version.ref = "protolayout" }
 androidx-protolayout-expression = { module = "androidx.wear.protolayout:protolayout-expression", version.ref = "protolayout" }
 androidx-protolayout-material = { module = "androidx.wear.protolayout:protolayout-material", version.ref = "protolayout" }
+androidx-protolayout-material3 = { module = "androidx.wear.protolayout:protolayout-material3", version.ref = "protolayout" }
 androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
 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" }

wear/build.gradle.kts

@@ -59,6 +59,7 @@ dependencies {
     implementation(libs.androidx.wear)
     implementation(libs.androidx.protolayout)
     implementation(libs.androidx.protolayout.material)
+    implementation(libs.androidx.protolayout.material3)
     implementation(libs.androidx.protolayout.expression)
     debugImplementation(libs.androidx.tiles.renderer)
     testImplementation(libs.androidx.tiles.testing)

wear/src/main/AndroidManifest.xml

@@ -52,6 +52,23 @@
         </service>
         <!-- [END android_wear_tile_manifest] -->
 
+        <!-- [START android_wear_m3_tile_manifest] -->
+        <service
+            android:name=".snippets.m3.tile.MyTileService"
+            android:label="@string/tile_label"
+            android:description="@string/tile_description"
+            android:icon="@mipmap/ic_launcher"
+            android:exported="true"
+            android:permission="com.google.android.wearable.permission.BIND_TILE_PROVIDER">
+            <intent-filter>
+                <action android:name="androidx.wear.tiles.action.BIND_TILE_PROVIDER" />
+            </intent-filter>
+
+            <meta-data android:name="androidx.wear.tiles.PREVIEW"
+                android:resource="@drawable/tile_preview" />
+        </service>
+        <!-- [END android_wear_m3_tile_manifest] -->
+
     </application>
 
 </manifest>

wear/src/main/java/com.example.wear.snippets.m3/tile/Tile.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2025 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.
@@ -16,11 +16,13 @@
 
 package com.example.wear.snippets.m3.tile
 
-import androidx.wear.protolayout.ColorBuilders.argb
 import androidx.wear.protolayout.ResourceBuilders.Resources
 import androidx.wear.protolayout.TimelineBuilders.Timeline
-import androidx.wear.protolayout.material.Text
-import androidx.wear.protolayout.material.Typography
+import androidx.wear.protolayout.material3.Typography.BODY_LARGE
+import androidx.wear.protolayout.material3.materialScope
+import androidx.wear.protolayout.material3.primaryLayout
+import androidx.wear.protolayout.material3.text
+import androidx.wear.protolayout.types.layoutString
 import androidx.wear.tiles.RequestBuilders
 import androidx.wear.tiles.RequestBuilders.ResourcesRequest
 import androidx.wear.tiles.TileBuilders.Tile
@@ -29,29 +31,30 @@ import com.google.common.util.concurrent.Futures
 
 private const val RESOURCES_VERSION = "1"
 
-// [START android_wear_tile_mytileservice]
+// [START android_wear_m3_tile_mytileservice]
 class MyTileService : TileService() {
 
-    override fun onTileRequest(requestParams: RequestBuilders.TileRequest) =
-        Futures.immediateFuture(
-            Tile.Builder()
-                .setResourcesVersion(RESOURCES_VERSION)
-                .setTileTimeline(
-                    Timeline.fromLayoutElement(
-                        Text.Builder(this, "Hello World!")
-                            .setTypography(Typography.TYPOGRAPHY_BODY1)
-                            .setColor(argb(0xFFFFFFFF.toInt()))
-                            .build()
-                    )
-                )
-                .build()
+  override fun onTileRequest(requestParams: RequestBuilders.TileRequest) =
+    Futures.immediateFuture(
+      Tile.Builder()
+        .setResourcesVersion(RESOURCES_VERSION)
+        .setTileTimeline(
+          Timeline.fromLayoutElement(
+            materialScope(this, requestParams.deviceConfiguration) {
+              primaryLayout(
+                mainSlot = {
+                  text("Hello, World!".layoutString, typography = BODY_LARGE)
+                }
+              )
+            }
+          )
         )
+        .build()
+    )
 
-    override fun onTileResourcesRequest(requestParams: ResourcesRequest) =
-        Futures.immediateFuture(
-            Resources.Builder()
-                .setVersion(RESOURCES_VERSION)
-                .build()
-        )
+  override fun onTileResourcesRequest(requestParams: ResourcesRequest) =
+    Futures.immediateFuture(
+      Resources.Builder().setVersion(RESOURCES_VERSION).build()
+    )
 }
-// [END android_wear_tile_mytileservice]
+// [END android_wear_m3_tile_mytileservice]