Fix HTML export category handling

Change-Id: Ia8f0c1aebb4e797352a0513b8113b5d6b75ef0dc

4 files changed, 14 insertions, 11 deletions

diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Category.java b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Category.java
index a318fc7..88b3c28 100644
--- a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Category.java
+++ b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Category.java
@@ -137,31 +137,31 @@ public final class Category implements Comparable<Category> {
     }
 
     /** Issues related to correctness */
-    public static final Category CORRECTNESS = Category.create("Correctness", 10);
+    public static final Category CORRECTNESS = Category.create("Correctness", 100);
 
     /** Issues related to security */
-    public static final Category SECURITY = Category.create("Security", 9);
+    public static final Category SECURITY = Category.create("Security", 90);
 
     /** Issues related to performance */
-    public static final Category PERFORMANCE = Category.create("Performance", 8);
+    public static final Category PERFORMANCE = Category.create("Performance", 80);
 
     /** Issues related to usability */
-    public static final Category USABILITY = Category.create("Usability", 7);
+    public static final Category USABILITY = Category.create("Usability", 70);
 
     /** Issues related to accessibility */
-    public static final Category A11Y = Category.create("Accessibility", 6);
+    public static final Category A11Y = Category.create("Accessibility", 60);
 
     /** Issues related to internationalization */
-    public static final Category I18N = Category.create("Internationalization", 5);
+    public static final Category I18N = Category.create("Internationalization", 50);
 
     // Sub categories
 
     /** Issues related to icons */
-    public static final Category ICONS = Category.create(USABILITY, "Icons", null, 7);
+    public static final Category ICONS = Category.create(USABILITY, "Icons", null, 73);
 
     /** Issues related to typography */
-    public static final Category TYPOGRAPHY = Category.create(USABILITY, "Typography", null, 8);
+    public static final Category TYPOGRAPHY = Category.create(USABILITY, "Typography", null, 76);
 
     /** Issues related to messages/strings */
-    public static final Category MESSAGES = Category.create(CORRECTNESS, "Messages", null, 10);
+    public static final Category MESSAGES = Category.create(CORRECTNESS, "Messages", null, 40);
 }
diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/DuplicateIdDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/DuplicateIdDetector.java
index 9c8ddea..7253009 100644
--- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/DuplicateIdDetector.java
+++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/DuplicateIdDetector.java
@@ -393,7 +393,7 @@ public class DuplicateIdDetector extends LayoutDetector {
 
     @Override
     public void visitAttribute(XmlContext context, Attr attribute) {
-        assert attribute.getLocalName().equals(ATTR_ID);
+        assert attribute.getName().equals(ATTR_ID) || attribute.getLocalName().equals(ATTR_ID);
         String id = attribute.getValue();
         if (mIds.contains(id)) {
             Location location = context.getLocation(attribute);
diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/StateListDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/StateListDetector.java
index 20fcf6b..3235c9a 100644
--- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/StateListDetector.java
+++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/StateListDetector.java
@@ -82,6 +82,9 @@ public class StateListDetector extends ResourceXmlDetector {
                 NamedNodeMap attributes = child.getAttributes();
                 for (int j = 0; j < attributes.getLength(); j++) {
                     Attr attribute = (Attr) attributes.item(j);
+                    if (attribute.getLocalName() == null) {
+                        continue;
+                    }
                     if (attribute.getLocalName().startsWith("state_")) {
                         hasState = true;
                         break;
diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongIdDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongIdDetector.java
index a664196..656f4de 100644
--- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongIdDetector.java
+++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongIdDetector.java
@@ -280,7 +280,7 @@ public class WrongIdDetector extends LayoutDetector {
 
     @Override
     public void visitAttribute(XmlContext context, Attr attribute) {
-        assert attribute.getLocalName().equals(ATTR_ID);
+        assert attribute.getName().equals(ATTR_ID) || attribute.getLocalName().equals(ATTR_ID);
         String id = attribute.getValue();
         mFileIds.add(id);
         mGlobalIds.add(id);