Separate DeviceArtPainter watch frames from AVD skins

Test: existing
Bug: N/A
Change-Id: I8b41b9aabff785250e59c8c8bbc22e69a02bd99c

9 files changed, 2 insertions, 2 deletions

diff --git a/artwork/resources/device-art-resources/device-art.xml b/artwork/resources/device-art-resources/device-art.xml
index e9b0e57b723..b67fa2033c7 100644
--- a/artwork/resources/device-art-resources/device-art.xml
+++ b/artwork/resources/device-art-resources/device-art.xml
@@ -60,12 +60,12 @@
     <orientation name="land" size="3427,1620" screenPos="442,71" screenSize="2560,1440" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
   </device>
 
-  <device id="wearos_square" name="Wear OS Square">
+  <device id="watch_square" name="Watch Square">
     <orientation name="port" size="474,403" screenPos="100,38" screenSize="280,280" shadow="shadow.png" back="back.png" lights="fore.png" mask="mask.png"/>
     <orientation name="land" size="474,403" screenPos="100,38" screenSize="280,280" shadow="shadow.png" back="back.png" lights="fore.png" mask="mask.png"/>
   </device>
 
-  <device id="wearos_small_round" name="Wear OS Round">
+  <device id="watch_round" name="Watch Round">
     <orientation name="port" size="370,424" screenPos="25,26" screenSize="320,320" shadow="shadow.png" back="back.png" lights="fore.png" mask="mask.png"/>
     <orientation name="land" size="370,424" screenPos="25,26" screenSize="320,320" shadow="shadow.png" back="back.png" lights="fore.png" mask="mask.png"/>
   </device>
diff --git a/artwork/resources/device-art-resources/wearos_small_round/back.png b/artwork/resources/device-art-resources/watch_round/back.png
index 69de2c0adc9..69de2c0adc9 100644
--- a/artwork/resources/device-art-resources/wearos_small_round/back.png
+++ b/artwork/resources/device-art-resources/watch_round/back.png
diff --git a/artwork/resources/device-art-resources/wearos_small_round/fore.png b/artwork/resources/device-art-resources/watch_round/fore.png
index 7066cf55ebc..7066cf55ebc 100644
--- a/artwork/resources/device-art-resources/wearos_small_round/fore.png
+++ b/artwork/resources/device-art-resources/watch_round/fore.png
diff --git a/artwork/resources/device-art-resources/wearos_small_round/mask.png b/artwork/resources/device-art-resources/watch_round/mask.png
index d5e8e59d487..d5e8e59d487 100644
--- a/artwork/resources/device-art-resources/wearos_small_round/mask.png
+++ b/artwork/resources/device-art-resources/watch_round/mask.png
diff --git a/artwork/resources/device-art-resources/wearos_small_round/shadow.png b/artwork/resources/device-art-resources/watch_round/shadow.png
index 28e9f17e8f6..28e9f17e8f6 100644
--- a/artwork/resources/device-art-resources/wearos_small_round/shadow.png
+++ b/artwork/resources/device-art-resources/watch_round/shadow.png
diff --git a/artwork/resources/device-art-resources/wearos_square/back.png b/artwork/resources/device-art-resources/watch_square/back.png
index 7f648e53ba4..7f648e53ba4 100644
--- a/artwork/resources/device-art-resources/wearos_square/back.png
+++ b/artwork/resources/device-art-resources/watch_square/back.png
diff --git a/artwork/resources/device-art-resources/wearos_square/fore.png b/artwork/resources/device-art-resources/watch_square/fore.png
index 58a4d72f1f3..58a4d72f1f3 100644
--- a/artwork/resources/device-art-resources/wearos_square/fore.png
+++ b/artwork/resources/device-art-resources/watch_square/fore.png
diff --git a/artwork/resources/device-art-resources/wearos_square/mask.png b/artwork/resources/device-art-resources/watch_square/mask.png
index a1f76324f8a..a1f76324f8a 100644
--- a/artwork/resources/device-art-resources/wearos_square/mask.png
+++ b/artwork/resources/device-art-resources/watch_square/mask.png
diff --git a/artwork/resources/device-art-resources/wearos_square/shadow.png b/artwork/resources/device-art-resources/watch_square/shadow.png
index bf4d058c257..bf4d058c257 100644
--- a/artwork/resources/device-art-resources/wearos_square/shadow.png
+++ b/artwork/resources/device-art-resources/watch_square/shadow.png