From 973ecdbca6e9b76e783bcc75464e920d6e505c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Odin=20Asbj=C3=B8rnsen?= <odinas004@gmail.com>
Date: Thu, 12 Sep 2024 18:12:35 +0200
Subject: [PATCH 1/3] Add wear_keep to datalayer-helper-guide and sample

---
 .../wear/src/main/res/values/wear_keep.xml      | 17 +++++++++++++++++
 docs/datalayer-helpers-guide.md                 |  7 ++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 datalayer/sample/wear/src/main/res/values/wear_keep.xml

diff --git a/datalayer/sample/wear/src/main/res/values/wear_keep.xml b/datalayer/sample/wear/src/main/res/values/wear_keep.xml
new file mode 100644
index 0000000000..2c83269b73
--- /dev/null
+++ b/datalayer/sample/wear/src/main/res/values/wear_keep.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2024 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.
+  -->
+
+<resources xmlns:tools="http://schemas.android.com/tools" tools:keep="@array/android_wear_capabilities"/>
diff --git a/docs/datalayer-helpers-guide.md b/docs/datalayer-helpers-guide.md
index 6856c0348f..7a7deae738 100644
--- a/docs/datalayer-helpers-guide.md
+++ b/docs/datalayer-helpers-guide.md
@@ -30,7 +30,7 @@ phone.
 
    Add a `wear.xml` file in the `res/values` folder with the following content:
 
-    ```
+    ```xml
     <resources xmlns:tools="http://schemas.android.com/tools"
         tools:keep="@array/android_wear_capabilities">
         <string-array name="android_wear_capabilities">
@@ -55,6 +55,11 @@ phone.
     </string-array>
     </resources>
     ```
+   and a `wear_keep.xml`
+
+   ```xml
+    <resources xmlns:tools="http://schemas.android.com/tools" tools:keep="@array/android_wear_capabilities"/>
+   ```
 
    on your wear and phone projects respectively.
 

From b0756e4e8db3d566fade5e406dfc01335389b522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Odin=20Asbj=C3=B8rnsen?= <odinas004@gmail.com>
Date: Fri, 13 Sep 2024 15:51:34 +0200
Subject: [PATCH 2/3] Move keep files to res/raw and update docs

---
 datalayer/sample/wear/src/main/res/{values => raw}/wear.xml   | 0
 .../sample/wear/src/main/res/{values => raw}/wear_keep.xml    | 0
 docs/datalayer-helpers-guide.md                               | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename datalayer/sample/wear/src/main/res/{values => raw}/wear.xml (100%)
 rename datalayer/sample/wear/src/main/res/{values => raw}/wear_keep.xml (100%)

diff --git a/datalayer/sample/wear/src/main/res/values/wear.xml b/datalayer/sample/wear/src/main/res/raw/wear.xml
similarity index 100%
rename from datalayer/sample/wear/src/main/res/values/wear.xml
rename to datalayer/sample/wear/src/main/res/raw/wear.xml
diff --git a/datalayer/sample/wear/src/main/res/values/wear_keep.xml b/datalayer/sample/wear/src/main/res/raw/wear_keep.xml
similarity index 100%
rename from datalayer/sample/wear/src/main/res/values/wear_keep.xml
rename to datalayer/sample/wear/src/main/res/raw/wear_keep.xml
diff --git a/docs/datalayer-helpers-guide.md b/docs/datalayer-helpers-guide.md
index 7a7deae738..1cf156faa8 100644
--- a/docs/datalayer-helpers-guide.md
+++ b/docs/datalayer-helpers-guide.md
@@ -28,7 +28,7 @@ phone.
 
 2. Add the capabilities
 
-   Add a `wear.xml` file in the `res/values` folder with the following content:
+   Add a `wear.xml` file in the `res/raw` folder with the following content:
 
     ```xml
     <resources xmlns:tools="http://schemas.android.com/tools"
@@ -55,7 +55,7 @@ phone.
     </string-array>
     </resources>
     ```
-   and a `wear_keep.xml`
+   and a `res/raw/wear_keep.xml`
 
    ```xml
     <resources xmlns:tools="http://schemas.android.com/tools" tools:keep="@array/android_wear_capabilities"/>

From 8c124aa3ed8fa0b54b45495c53066b10612c21fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Odin=20Asbj=C3=B8rnsen?= <odinas004@gmail.com>
Date: Fri, 13 Sep 2024 16:49:41 +0200
Subject: [PATCH 3/3] Mention issue with link in datalayer-helpers-guide

---
 docs/datalayer-helpers-guide.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/datalayer-helpers-guide.md b/docs/datalayer-helpers-guide.md
index 1cf156faa8..c0984d5ffd 100644
--- a/docs/datalayer-helpers-guide.md
+++ b/docs/datalayer-helpers-guide.md
@@ -28,7 +28,8 @@ phone.
 
 2. Add the capabilities
 
-   Add a `wear.xml` file in the `res/raw` folder with the following content:
+   Add a `wear.xml` file in the `res/raw` folder with the following content. It needs to be
+   `res/raw` folder due to https://issuetracker.google.com/issues/348688201
 
     ```xml
     <resources xmlns:tools="http://schemas.android.com/tools"