Snap for 10447354 from 73795dc1730b7de32b1f9842abeb129cee04390e to mainline-resolv-releaseaml_res_341510000aml_res_341410010aml_res_341311030aml_res_341110000aml_res_340912000android14-mainline-resolv-release

Change-Id: If9aea559857bedab2921a89c1d182dcb6768ffc7

7 files changed, 39 insertions, 1 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bb76649..90b9ccf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 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.
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.dreams.basic"
     >
@@ -14,6 +31,9 @@
                 <action android:name="android.service.dreams.DreamService" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <meta-data
+                android:name="android.service.dream"
+                android:resource="@xml/screensaver_info" />
         </service>
     </application>
 </manifest>
diff --git a/res/drawable-hdpi/preview.png b/res/drawable-hdpi/preview.png
new file mode 100644
index 0000000..12ab9a8
--- /dev/null
+++ b/res/drawable-hdpi/preview.png
diff --git a/res/drawable-ldpi/preview.png b/res/drawable-ldpi/preview.png
new file mode 100644
index 0000000..d2cad8b
--- /dev/null
+++ b/res/drawable-ldpi/preview.png
diff --git a/res/drawable-mdpi/preview.png b/res/drawable-mdpi/preview.png
new file mode 100644
index 0000000..0f2497a
--- /dev/null
+++ b/res/drawable-mdpi/preview.png
diff --git a/res/drawable-xhdpi/preview.png b/res/drawable-xhdpi/preview.png
new file mode 100644
index 0000000..39d657e
--- /dev/null
+++ b/res/drawable-xhdpi/preview.png
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 5c0ad62..0274572 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="6121278918841215202">"Basic Daydreams"</string>
-    <string name="color_dream_name" msgid="9063813186991472050">"Colours"</string>
+    <string name="color_dream_name" msgid="9063813186991472050">"Colors"</string>
 </resources>
diff --git a/res/xml/screensaver_info.xml b/res/xml/screensaver_info.xml
new file mode 100644
index 0000000..5a02b40
--- /dev/null
+++ b/res/xml/screensaver_info.xml
@@ -0,0 +1,18 @@
+ <!--
+  ~ Copyright (C) 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.
+  -->
+
+ <dream xmlns:android="http://schemas.android.com/apk/res/android"
+    android:previewImage="@drawable/preview" />