Move product icon and activity to StudioIcons

Test: Visual inspection of local build
Bug: n/a
Change-Id: I6edd7b48dbba93b739aebd837fbea2ef13742f7b

8 files changed, 4 insertions, 6 deletions

diff --git a/artwork/gen/icons/StudioIcons.java b/artwork/gen/icons/StudioIcons.java
index ab7640f5960..be459de3991 100644
--- a/artwork/gen/icons/StudioIcons.java
+++ b/artwork/gen/icons/StudioIcons.java
@@ -743,6 +743,7 @@ public class StudioIcons {
 
   public static class Shell {
     public static class Filetree {
+      public static final Icon ACTIVITY = load("/studio/icons/shell/filetree/activity.svg"); // 16x16
       public static final Icon ANDROID_FILE = load("/studio/icons/shell/filetree/android-file.svg"); // 16x16
       public static final Icon ANDROID_MODULE = load("/studio/icons/shell/filetree/android-module.svg"); // 16x16
       public static final Icon ANDROID_PROJECT = load("/studio/icons/shell/filetree/android-project.svg"); // 16x16
diff --git a/artwork/gen/icons/StudioIllustrations.java b/artwork/gen/icons/StudioIllustrations.java
index 385c802aae7..88ba3e00a12 100644
--- a/artwork/gen/icons/StudioIllustrations.java
+++ b/artwork/gen/icons/StudioIllustrations.java
@@ -18,6 +18,7 @@ public class StudioIllustrations {
   public static class Common {
     public static final Icon DISCONNECT_PROFILER = load("/studio/illustrations/common/disconnect-profiler.svg"); // 171x97
     public static final Icon DISCONNECT = load("/studio/illustrations/common/disconnect.svg"); // 171x97
+    public static final Icon PRODUCT_ICON = load("/studio/illustrations/common/product-icon.svg"); // 64x64
   }
 
   public static class FormFactors {
diff --git a/artwork/resources/icons/activity.png b/artwork/resources/icons/activity.png
deleted file mode 100644
index 1b727f136a0..00000000000
--- a/artwork/resources/icons/activity.png
+++ /dev/null
diff --git a/artwork/resources/icons/activity@2x.png b/artwork/resources/icons/activity@2x.png
deleted file mode 100644
index 6d1c7f22ce1..00000000000
--- a/artwork/resources/icons/activity@2x.png
+++ /dev/null
diff --git a/artwork/resources/studio/icons/shell/filetree/activity.svg b/artwork/resources/studio/icons/shell/filetree/activity.svg
new file mode 100644
index 00000000000..02214dfabdd
--- /dev/null
+++ b/artwork/resources/studio/icons/shell/filetree/activity.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4.109 2.546C4 2.76 4 3.04 4 3.6v8.8c0 .56 0 .84.109 1.054a1 1 0 0 0 .437.437C4.76 14 5.04 14 5.6 14h4.8c.56 0 .84 0 1.054-.109a1 1 0 0 0 .437-.437C12 13.24 12 12.96 12 12.4V3.6c0-.56 0-.84-.109-1.054a1 1 0 0 0-.437-.437C11.24 2 10.96 2 10.4 2H5.6c-.56 0-.84 0-1.054.109a1 1 0 0 0-.437.437zM11 5H5v8h6V5z" fill="#9AA7B0"/></svg>
\ No newline at end of file
diff --git a/artwork/resources/studio/icons/shell/filetree/activity_dark.svg b/artwork/resources/studio/icons/shell/filetree/activity_dark.svg
new file mode 100644
index 00000000000..02214dfabdd
--- /dev/null
+++ b/artwork/resources/studio/icons/shell/filetree/activity_dark.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4.109 2.546C4 2.76 4 3.04 4 3.6v8.8c0 .56 0 .84.109 1.054a1 1 0 0 0 .437.437C4.76 14 5.04 14 5.6 14h4.8c.56 0 .84 0 1.054-.109a1 1 0 0 0 .437-.437C12 13.24 12 12.96 12 12.4V3.6c0-.56 0-.84-.109-1.054a1 1 0 0 0-.437-.437C11.24 2 10.96 2 10.4 2H5.6c-.56 0-.84 0-1.054.109a1 1 0 0 0-.437.437zM11 5H5v8h6V5z" fill="#9AA7B0"/></svg>
\ No newline at end of file
diff --git a/artwork/resources/icons/wizards/studio_product.svg b/artwork/resources/studio/illustrations/common/product-icon.svg
index 7f1a0d53afb..7f1a0d53afb 100644
--- a/artwork/resources/icons/wizards/studio_product.svg
+++ b/artwork/resources/studio/illustrations/common/product-icon.svg
diff --git a/artwork/src/icons/AndroidIcons.java b/artwork/src/icons/AndroidIcons.java
index f5a3033c08f..4a3ac555a72 100644
--- a/artwork/src/icons/AndroidIcons.java
+++ b/artwork/src/icons/AndroidIcons.java
@@ -8,12 +8,6 @@ public class AndroidIcons {
     return IconLoader.getIcon(path, AndroidIcons.class);
   }
 
-  public static final Icon Activity = load("/icons/activity.png"); // 16x16
-
-  public static class Wizards {
-    public static final Icon StudioProductIcon = load("/icons/wizards/studio_product.svg"); // 64x64
-  }
-
   public static class DeviceExplorer {
     public static final Icon DevicesLineup = load("/icons/explorer/devices-lineup.png"); // 300x150
   }