diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/text/AutofillSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/text/AutofillSnippets.kt
new file mode 100644
index 00000000..6e30ba93
--- /dev/null
+++ b/compose/snippets/src/main/java/com/example/compose/snippets/text/AutofillSnippets.kt
@@ -0,0 +1,130 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *     https://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.
+ */
+
+package com.example.compose.snippets.text
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.text.LocalAutofillHighlightColor
+import androidx.compose.foundation.text.input.rememberTextFieldState
+//noinspection UsingMaterialAndMaterial3Libraries
+import androidx.compose.material.TextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.autofill.ContentType
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalAutofillManager
+import androidx.compose.ui.semantics.contentType
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.unit.dp
+import com.example.compose.snippets.touchinput.Button
+
+@Composable
+fun AddAutofill() {
+    // [START android_compose_autofill_1]
+    TextField(
+        state = rememberTextFieldState(),
+        modifier = Modifier.semantics { contentType = ContentType.Username }
+    )
+    // [END android_compose_autofill_1]
+}
+
+@Composable
+fun AddMultipleTypesOfAutofill() {
+    // [START android_compose_autofill_2]
+    TextField(
+        state = rememberTextFieldState(),
+        modifier = Modifier.semantics {
+            contentType = ContentType.Username + ContentType.EmailAddress
+        }
+    )
+    // [END android_compose_autofill_2]
+}
+
+@Composable
+fun AutofillManager() {
+    // [START android_compose_autofill_3]
+    val autofillManager = LocalAutofillManager.current
+    // [END android_compose_autofill_3]
+}
+
+@Composable
+fun SaveDataWithAutofill() {
+    var textFieldValue = remember {
+        mutableStateOf(TextFieldValue(""))
+    }
+    // [START android_compose_autofill_4]
+    val autofillManager = LocalAutofillManager.current
+
+    Column {
+        TextField(
+            state = rememberTextFieldState(),
+            modifier = Modifier.semantics { contentType = ContentType.NewUsername }
+        )
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        TextField(
+            state = rememberTextFieldState(),
+            modifier = Modifier.semantics { contentType = ContentType.NewPassword }
+        )
+    }
+    // [END android_compose_autofill_4]
+}
+
+@Composable
+fun SaveDataWithAutofillOnClick() {
+    // [START android_compose_autofill_5]
+    val autofillManager = LocalAutofillManager.current
+
+    Column {
+        TextField(
+            state = rememberTextFieldState(),
+            modifier = Modifier.semantics { contentType = ContentType.NewUsername },
+        )
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        TextField(
+            state = rememberTextFieldState(),
+            modifier = Modifier.semantics { contentType = ContentType.NewPassword },
+        )
+
+        // Submit button
+        Button(onClick = { autofillManager?.commit() }) { Text("Reset credentials") }
+    }
+    // [END android_compose_autofill_5]
+}
+
+@Composable
+fun CustomAutofillHighlight(customHighlightColor: Color = Color.Red) {
+    // [START android_compose_autofill_6]
+    val customHighlightColor = Color.Red
+
+    CompositionLocalProvider(LocalAutofillHighlightColor provides customHighlightColor) {
+        TextField(
+            state = rememberTextFieldState(),
+            modifier = Modifier.semantics { contentType = ContentType.Username }
+        )
+    }
+    // [END android_compose_autofill_6]
+}