New icons to deprecate old ones in AndroidIcons

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

26 files changed, 15 insertions, 12 deletions

diff --git a/artwork/gen/icons/StudioIcons.java b/artwork/gen/icons/StudioIcons.java
index 70674b236ac..ab7640f5960 100644
--- a/artwork/gen/icons/StudioIcons.java
+++ b/artwork/gen/icons/StudioIcons.java
@@ -44,6 +44,7 @@ public class StudioIcons {
     /** @deprecated use AllIcons.General.Add */
     @Deprecated
     public static final Icon ADD = load("/studio/icons/common/add.svg"); // 16x16
+    public static final Icon ANDROID_HEAD = load("/studio/icons/common/android-head.svg"); // 16x16
 
     /** @deprecated use AllIcons.Actions.Back */
     @Deprecated
@@ -209,6 +210,7 @@ public class StudioIcons {
   }
 
   public static class DeviceExplorer {
+    public static final Icon DATABASE_FOLDER = load("/studio/icons/device-explorer/database-folder.svg"); // 16x16
     public static final Icon DEVICE_PAIRED = load("/studio/icons/device-explorer/device-paired.svg"); // 16x16
     public static final Icon MULTIPLE_DEVICES = load("/studio/icons/device-explorer/multiple-devices.svg"); // 16x16
     public static final Icon PHYSICAL_DEVICE_CAR = load("/studio/icons/device-explorer/physical-device-car.svg"); // 16x16
@@ -545,6 +547,7 @@ public class StudioIcons {
       public static final Icon DISTRIBUTE_VERTICAL_CONSTRAINT = load("/studio/icons/layout-editor/toolbar/distribute-vertical-constraint.svg"); // 16x16
       public static final Icon DISTRIBUTE_VERTICAL = load("/studio/icons/layout-editor/toolbar/distribute-vertical.svg"); // 16x16
       public static final Icon DISTRIBUTE_WEIGHT = load("/studio/icons/layout-editor/toolbar/distribute-weight.svg"); // 16x16
+      public static final Icon EMPTY_FLAG = load("/studio/icons/layout-editor/toolbar/empty-flag.svg"); // 16x16
       public static final Icon EXPAND_HORIZONTAL = load("/studio/icons/layout-editor/toolbar/expand-horizontal.svg"); // 16x16
       public static final Icon EXPAND_TO_FIT = load("/studio/icons/layout-editor/toolbar/expand-to-fit.svg"); // 16x16
       public static final Icon EXPAND_VERTICAL = load("/studio/icons/layout-editor/toolbar/expand-vertical.svg"); // 16x16
@@ -627,7 +630,9 @@ public class StudioIcons {
     public static final Icon GRADLE_VARIABLE = load("/studio/icons/misc/gradle-variable.svg"); // 16x16
     public static final Icon PRODUCT_FLAVOR_DIMENSION = load("/studio/icons/misc/product-flavor-dimension.svg"); // 16x16
     public static final Icon PRODUCT_FLAVOR = load("/studio/icons/misc/product-flavor.svg"); // 16x16
+    public static final Icon PROJECT_SYSTEM_VARIANT = load("/studio/icons/misc/project-system-variant.svg"); // 16x16
     public static final Icon SIGNING_CONFIG = load("/studio/icons/misc/signing-config.svg"); // 16x16
+    public static final Icon TUTORIAL_INDICATOR = load("/studio/icons/misc/tutorial-indicator.svg"); // 18x18
   }
 
   public static class NavEditor {
diff --git a/artwork/resources/icons/assistant/tutorialIndicator.png b/artwork/resources/icons/assistant/tutorialIndicator.png
deleted file mode 100644
index ca7d7c28c46..00000000000
--- a/artwork/resources/icons/assistant/tutorialIndicator.png
+++ /dev/null
diff --git a/artwork/resources/icons/assistant/tutorialIndicator@2x.png b/artwork/resources/icons/assistant/tutorialIndicator@2x.png
deleted file mode 100644
index 2c27b0e9d66..00000000000
--- a/artwork/resources/icons/assistant/tutorialIndicator@2x.png
+++ /dev/null
diff --git a/artwork/resources/icons/assistant/tutorialIndicator@2x_dark.png b/artwork/resources/icons/assistant/tutorialIndicator@2x_dark.png
deleted file mode 100644
index 1c01ac65f2e..00000000000
--- a/artwork/resources/icons/assistant/tutorialIndicator@2x_dark.png
+++ /dev/null
diff --git a/artwork/resources/icons/assistant/tutorialIndicator_dark.png b/artwork/resources/icons/assistant/tutorialIndicator_dark.png
deleted file mode 100644
index 79fbe5b4d24..00000000000
--- a/artwork/resources/icons/assistant/tutorialIndicator_dark.png
+++ /dev/null
diff --git a/artwork/resources/icons/explorer/DatabaseFolder.png b/artwork/resources/icons/explorer/DatabaseFolder.png
deleted file mode 100644
index 2d242a31ddb..00000000000
--- a/artwork/resources/icons/explorer/DatabaseFolder.png
+++ /dev/null
diff --git a/artwork/resources/icons/explorer/DatabaseFolder@2x.png b/artwork/resources/icons/explorer/DatabaseFolder@2x.png
deleted file mode 100644
index 79dcc26d631..00000000000
--- a/artwork/resources/icons/explorer/DatabaseFolder@2x.png
+++ /dev/null
diff --git a/artwork/resources/icons/explorer/DatabaseFolder@2x_dark.png b/artwork/resources/icons/explorer/DatabaseFolder@2x_dark.png
deleted file mode 100644
index 8b251b8152a..00000000000
--- a/artwork/resources/icons/explorer/DatabaseFolder@2x_dark.png
+++ /dev/null
diff --git a/artwork/resources/icons/explorer/DatabaseFolder_dark.png b/artwork/resources/icons/explorer/DatabaseFolder_dark.png
deleted file mode 100644
index b53465d0ce4..00000000000
--- a/artwork/resources/icons/explorer/DatabaseFolder_dark.png
+++ /dev/null
diff --git a/artwork/resources/icons/notMatch.png b/artwork/resources/icons/notMatch.png
deleted file mode 100644
index c5f4c69877c..00000000000
--- a/artwork/resources/icons/notMatch.png
+++ /dev/null
diff --git a/artwork/resources/icons/notMatch@2x.png b/artwork/resources/icons/notMatch@2x.png
deleted file mode 100644
index 5b8b5bceb67..00000000000
--- a/artwork/resources/icons/notMatch@2x.png
+++ /dev/null
diff --git a/artwork/resources/icons/notMatch@2x_dark.png b/artwork/resources/icons/notMatch@2x_dark.png
deleted file mode 100644
index 5b8b5bceb67..00000000000
--- a/artwork/resources/icons/notMatch@2x_dark.png
+++ /dev/null
diff --git a/artwork/resources/icons/notMatch_dark.png b/artwork/resources/icons/notMatch_dark.png
deleted file mode 100644
index c5f4c69877c..00000000000
--- a/artwork/resources/icons/notMatch_dark.png
+++ /dev/null
diff --git a/artwork/resources/icons/variant.png b/artwork/resources/icons/variant.png
deleted file mode 100644
index 5acd2698ca5..00000000000
--- a/artwork/resources/icons/variant.png
+++ /dev/null
diff --git a/artwork/resources/icons/variant@2x.png b/artwork/resources/icons/variant@2x.png
deleted file mode 100644
index 030ab4ae9b2..00000000000
--- a/artwork/resources/icons/variant@2x.png
+++ /dev/null
diff --git a/artwork/resources/studio/icons/common/android-head.svg b/artwork/resources/studio/icons/common/android-head.svg
new file mode 100644
index 00000000000..caba1ac65fb
--- /dev/null
+++ b/artwork/resources/studio/icons/common/android-head.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="M11.63 4l.866.5-1.372 2.376A5.996 5.996 0 0 1 14 12H2a5.996 5.996 0 0 1 2.873-5.122L3.5 4.5l.866-.5 1.402 2.429A5.984 5.984 0 0 1 8 6c.787 0 1.54.152 2.229.427L11.63 4zM5 9h1v1H5V9zm6 0h-1v1h1V9z" fill="#3DDC84"/></svg>
\ No newline at end of file
diff --git a/artwork/resources/studio/icons/common/android-head_dark.svg b/artwork/resources/studio/icons/common/android-head_dark.svg
new file mode 100644
index 00000000000..caba1ac65fb
--- /dev/null
+++ b/artwork/resources/studio/icons/common/android-head_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="M11.63 4l.866.5-1.372 2.376A5.996 5.996 0 0 1 14 12H2a5.996 5.996 0 0 1 2.873-5.122L3.5 4.5l.866-.5 1.402 2.429A5.984 5.984 0 0 1 8 6c.787 0 1.54.152 2.229.427L11.63 4zM5 9h1v1H5V9zm6 0h-1v1h1V9z" fill="#3DDC84"/></svg>
\ No newline at end of file
diff --git a/artwork/resources/studio/icons/device-explorer/database-folder.svg b/artwork/resources/studio/icons/device-explorer/database-folder.svg
new file mode 100644
index 00000000000..7d7804ec4c5
--- /dev/null
+++ b/artwork/resources/studio/icons/device-explorer/database-folder.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="M1 4.773c1.548.825 4.106 1.365 7 1.365s5.452-.54 7-1.365v1.493c0 1.064-3.134 1.927-7 1.927S1 7.33 1 6.266V4.773zm14 3.34v1.586c0 1.013-3.134 1.833-7 1.833s-7-.82-7-1.833V8.113c1.548.825 4.106 1.364 7 1.364s5.452-.54 7-1.364zm0 3.34v1.62C15 14.137 11.866 15 8 15s-7-.863-7-1.927v-1.62c1.548.824 4.106 1.364 7 1.364s5.452-.54 7-1.365v.001zm-7-6.6c-3.866 0-7-.862-7-1.926S4.134 1 8 1s7 .863 7 1.927-3.134 1.926-7 1.926z" fill="#6E6E6E"/></svg>
\ No newline at end of file
diff --git a/artwork/resources/studio/icons/device-explorer/database-folder_dark.svg b/artwork/resources/studio/icons/device-explorer/database-folder_dark.svg
new file mode 100644
index 00000000000..2873aa66063
--- /dev/null
+++ b/artwork/resources/studio/icons/device-explorer/database-folder_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="M1 4.773c1.548.825 4.106 1.365 7 1.365s5.452-.54 7-1.365v1.493c0 1.064-3.134 1.927-7 1.927S1 7.33 1 6.266V4.773zm14 3.34v1.586c0 1.013-3.134 1.833-7 1.833s-7-.82-7-1.833V8.113c1.548.825 4.106 1.364 7 1.364s5.452-.54 7-1.364zm0 3.34v1.62C15 14.137 11.866 15 8 15s-7-.863-7-1.927v-1.62c1.548.824 4.106 1.364 7 1.364s5.452-.54 7-1.365v.001zm-7-6.6c-3.866 0-7-.862-7-1.926S4.134 1 8 1s7 .863 7 1.927-3.134 1.926-7 1.926z" fill="#AFB1B3"/></svg>
\ No newline at end of file
diff --git a/artwork/resources/studio/icons/layout-editor/toolbar/empty-flag.svg b/artwork/resources/studio/icons/layout-editor/toolbar/empty-flag.svg
new file mode 100644
index 00000000000..50e5de3cfa4
--- /dev/null
+++ b/artwork/resources/studio/icons/layout-editor/toolbar/empty-flag.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="url(#paint0_linear)" stroke="#AFB1B3" d="M.5 2.5h15v11H.5z"/><defs><linearGradient id="paint0_linear" x1="0" y1="8" x2="16" y2="8" gradientUnits="userSpaceOnUse"><stop offset=".526" stop-color="#fff"/><stop offset="1" stop-color="#DDD"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/artwork/resources/studio/icons/layout-editor/toolbar/empty-flag_dark.svg b/artwork/resources/studio/icons/layout-editor/toolbar/empty-flag_dark.svg
new file mode 100644
index 00000000000..50e5de3cfa4
--- /dev/null
+++ b/artwork/resources/studio/icons/layout-editor/toolbar/empty-flag_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="url(#paint0_linear)" stroke="#AFB1B3" d="M.5 2.5h15v11H.5z"/><defs><linearGradient id="paint0_linear" x1="0" y1="8" x2="16" y2="8" gradientUnits="userSpaceOnUse"><stop offset=".526" stop-color="#fff"/><stop offset="1" stop-color="#DDD"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/artwork/resources/studio/icons/misc/project-system-variant.svg b/artwork/resources/studio/icons/misc/project-system-variant.svg
new file mode 100644
index 00000000000..22cdade24e4
--- /dev/null
+++ b/artwork/resources/studio/icons/misc/project-system-variant.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="M13 16h3v-3h-3v3zM13 12h3V9h-3v3zM9 16h3v-3H9v3zM9 12h3V9H9v3z" fill="#40B6E0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M4 5h8v3h2V3H2v10h6v-2H4V5z" fill="#6E6E6E"/></svg>
\ No newline at end of file
diff --git a/artwork/resources/studio/icons/misc/project-system-variant_dark.svg b/artwork/resources/studio/icons/misc/project-system-variant_dark.svg
new file mode 100644
index 00000000000..d0f0aa47956
--- /dev/null
+++ b/artwork/resources/studio/icons/misc/project-system-variant_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="M13 16h3v-3h-3v3zM13 12h3V9h-3v3zM9 16h3v-3H9v3zM9 12h3V9H9v3z" fill="#40B6E0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M4 5h8v3h2V3H2v10h6v-2H4V5z" fill="#AFB1B3"/></svg>
\ No newline at end of file
diff --git a/artwork/resources/studio/icons/misc/tutorial-indicator.svg b/artwork/resources/studio/icons/misc/tutorial-indicator.svg
new file mode 100644
index 00000000000..b9e00f418c9
--- /dev/null
+++ b/artwork/resources/studio/icons/misc/tutorial-indicator.svg
@@ -0,0 +1 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M9 1.8A7.198 7.198 0 0 0 1.8 9c0 3.978 3.222 7.2 7.2 7.2s7.2-3.222 7.2-7.2S12.978 1.8 9 1.8zm0 13.05A5.861 5.861 0 0 1 3.15 9 5.861 5.861 0 0 1 9 3.15 5.861 5.861 0 0 1 14.85 9 5.861 5.861 0 0 1 9 14.85z" fill="#6E6E6E"/><path d="M7.2 12.15L12.15 9 7.2 5.85v6.3z" fill="#6E6E6E"/></svg>
\ No newline at end of file
diff --git a/artwork/resources/studio/icons/misc/tutorial-indicator_dark.svg b/artwork/resources/studio/icons/misc/tutorial-indicator_dark.svg
new file mode 100644
index 00000000000..7307a4f6bb9
--- /dev/null
+++ b/artwork/resources/studio/icons/misc/tutorial-indicator_dark.svg
@@ -0,0 +1 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M9 1.8A7.198 7.198 0 0 0 1.8 9c0 3.978 3.222 7.2 7.2 7.2s7.2-3.222 7.2-7.2S12.978 1.8 9 1.8zm0 13.05A5.861 5.861 0 0 1 3.15 9 5.861 5.861 0 0 1 9 3.15 5.861 5.861 0 0 1 14.85 9 5.861 5.861 0 0 1 9 14.85z" fill="#AFB1B3"/><path d="M7.2 12.15L12.15 9 7.2 5.85v6.3z" fill="#AFB1B3"/></svg>
\ No newline at end of file
diff --git a/artwork/src/icons/AndroidIcons.java b/artwork/src/icons/AndroidIcons.java
index 443b9d82992..06415f2d514 100644
--- a/artwork/src/icons/AndroidIcons.java
+++ b/artwork/src/icons/AndroidIcons.java
@@ -10,15 +10,8 @@ public class AndroidIcons {
 
   public static final Icon Android = load("/icons/android.svg"); // 16x16
 
-  public static final Icon NotMatch = load("/icons/notMatch.png");
-
   public static final Icon Activity = load("/icons/activity.png"); // 16x16
 
-  public static final Icon EmptyFlag = load("/icons/flags/flag_empty.png"); // 16x16
-
-
-  public static final Icon Variant = load("/icons/variant.png");
-
   public static class Wizards {
     public static final Icon StudioProductIcon = load("/icons/wizards/studio_product.svg"); // 64x64
     // Template thumbnails
@@ -37,11 +30,6 @@ public class AndroidIcons {
   }
 
   public static class DeviceExplorer {
-    public static final Icon DatabaseFolder = load("/icons/explorer/DatabaseFolder.png"); // 16x16
     public static final Icon DevicesLineup = load("/icons/explorer/devices-lineup.png"); // 300x150
   }
-
-  public static class Assistant {
-    public static final Icon TutorialIndicator = load("/icons/assistant/tutorialIndicator.png"); // 16x16
-  }
 }