From 75236238dc4bac5fc1b65d480ab81084f240619e Mon Sep 17 00:00:00 2001
From: Aaron Labiaga <alabiaga@google.com>
Date: Wed, 13 Aug 2025 06:30:26 -0600
Subject: [PATCH 1/2] Add category for quick tiles

Change-Id: I29def8cf1523d4cd063e1095484cff3ca9efa088
---
 samples/user-interface/quicksettings/build.gradle.kts       | 2 +-
 .../quicksettings/src/main/AndroidManifest.xml              | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/samples/user-interface/quicksettings/build.gradle.kts b/samples/user-interface/quicksettings/build.gradle.kts
index 80b5983e..1f970f6d 100644
--- a/samples/user-interface/quicksettings/build.gradle.kts
+++ b/samples/user-interface/quicksettings/build.gradle.kts
@@ -26,7 +26,7 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
+        targetSdk = 36
     }
     kotlinOptions {
         jvmTarget = "1.8"
diff --git a/samples/user-interface/quicksettings/src/main/AndroidManifest.xml b/samples/user-interface/quicksettings/src/main/AndroidManifest.xml
index 8f6d837c..2fbe14cd 100644
--- a/samples/user-interface/quicksettings/src/main/AndroidManifest.xml
+++ b/samples/user-interface/quicksettings/src/main/AndroidManifest.xml
@@ -47,6 +47,12 @@
             <meta-data
                 android:name="android.service.quicksettings.TOGGLEABLE_TILE"
                 android:value="true" />
+            <!--
+                  Categorize this tile as a Utility so that it's organized in that category in
+                  Quick Settings edit. Available in Android 16.1.
+             -->
+            <meta-data android:name="android.service.quicksettings.TILE_CATEGORY"
+                android:value="android.service.quicksettings.CATEGORY_UTILITIES" />
         </service>
 
     </application>

From ac3e207a33cfd0b5b6b1b5d690f96d1a3a47b1a0 Mon Sep 17 00:00:00 2001
From: Aaron Labiaga <alabiaga@google.com>
Date: Wed, 20 Aug 2025 12:53:28 -0600
Subject: [PATCH 2/2] add version and format changes

Change-Id: Iab0b01de7ce02727869d479de64a17c6737715df
---
 .../quicksettings/src/main/AndroidManifest.xml             | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/samples/user-interface/quicksettings/src/main/AndroidManifest.xml b/samples/user-interface/quicksettings/src/main/AndroidManifest.xml
index 2fbe14cd..39b53518 100644
--- a/samples/user-interface/quicksettings/src/main/AndroidManifest.xml
+++ b/samples/user-interface/quicksettings/src/main/AndroidManifest.xml
@@ -33,7 +33,6 @@
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
-
             <!--
                 This tile listens and keeps track of its state when the app calls
                 [TileService.requestListeningState].
@@ -49,9 +48,11 @@
                 android:value="true" />
             <!--
                   Categorize this tile as a Utility so that it's organized in that category in
-                  Quick Settings edit. Available in Android 16.1.
+                  Quick Settings edit. Available in Android 16 QPR 2
+                  Build.VERSION_CODES_FULL.BAKLAVA_1
              -->
-            <meta-data android:name="android.service.quicksettings.TILE_CATEGORY"
+            <meta-data
+                android:name="android.service.quicksettings.TILE_CATEGORY"
                 android:value="android.service.quicksettings.CATEGORY_UTILITIES" />
         </service>