commit 089ebf624b9adf64a9cfdd33fb73bff01aab9b65
author Chris Sinco <csinco@google.com> Mon Nov 21 20:54:40 2022 -0800
committer Chris Sinco <csinco@google.com> Tue Nov 22 09:30:37 2022 -0800
tree fc66ca321952e5fd8f9606da849a14c189245b7e
parent 16dc4e6788e459d473827e0fbe99c5b325a69241

Deprecate use of UrlAssistIcons.java

Test: Visual inspection of local build
Bug: 255357983
Change-Id: Ib30fd618e0fb07e57d8f874393c5f8b90d8db86c

BUILD

diff --git a/BUILD b/BUILD
index b82bbcf..914753f 100644
--- a/BUILD
+++ b/BUILD
@@ -33,5 +33,6 @@
         "//tools/adt/idea/project-system-gradle:intellij.android.projectSystem.gradle[module]",
         "//tools/adt/idea/project-system-gradle-models:intellij.android.projectSystem.gradle.models[module]",
         "//tools/adt/idea/execution/common:intellij.android.execution.common[module]",
+        "//tools/adt/idea/artwork:intellij.android.artwork[module]",
     ],
 )

google-appindexing.iml

diff --git a/google-appindexing.iml b/google-appindexing.iml
index 46315c9..d5d8bfe 100644
--- a/google-appindexing.iml
+++ b/google-appindexing.iml
@@ -38,5 +38,6 @@
     <orderEntry type="module" module-name="intellij.android.projectSystem.gradle" />
     <orderEntry type="module" module-name="intellij.android.projectSystem.gradle.models" />
     <orderEntry type="module" module-name="intellij.android.execution.common" />
+    <orderEntry type="module" module-name="intellij.android.artwork" />
   </component>
 </module>
\ No newline at end of file

src/com/google/appindexing/ui/InsertApiCodeDialog.java

diff --git a/src/com/google/appindexing/ui/InsertApiCodeDialog.java b/src/com/google/appindexing/ui/InsertApiCodeDialog.java
index c7f9a81..481a308 100644
--- a/src/com/google/appindexing/ui/InsertApiCodeDialog.java
+++ b/src/com/google/appindexing/ui/InsertApiCodeDialog.java
@@ -20,7 +20,6 @@
 import com.google.appindexing.api.ApiCreator;
 import com.google.appindexing.util.AppIndexingBundle;
 import com.google.urlassistant.ActivityData;
-import com.google.urlassistant.UrlAssistIcons;
 import com.google.urlassistant.util.ManifestUtils;
 import com.google.wireless.android.sdk.stats.AndroidStudioEvent;
 import com.intellij.ide.BrowserUtil;
@@ -44,13 +43,22 @@
 import com.intellij.ui.components.JBScrollPane;
 import com.intellij.uiDesigner.core.GridConstraints;
 import com.intellij.uiDesigner.core.GridLayoutManager;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
-import java.awt.*;
+import icons.StudioIcons;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.MouseEvent;
 import java.util.List;
+import javax.swing.AbstractListModel;
+import javax.swing.Action;
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JTextPane;
+import javax.swing.ListSelectionModel;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A dialog to select activity for code inserting.
@@ -90,7 +98,7 @@
     GridConstraints constraints = new GridConstraints();
     constraints.setAnchor(GridConstraints.ANCHOR_WEST);
     JBLabel iconLabel = new JBLabel();
-    iconLabel.setIcon(UrlAssistIcons.FAIL_ICON);
+    iconLabel.setIcon(StudioIcons.Common.ERROR);
     myMessagePanel.add(iconLabel, constraints);
 
     constraints.setColumn(1);