Merge "Tweak resource type inspection test" into idea133
diff --git a/android/src/org/jetbrains/android/inspections/ResourceTypeInspection.java b/android/src/org/jetbrains/android/inspections/ResourceTypeInspection.java
index e545d24..b05319e 100644
--- a/android/src/org/jetbrains/android/inspections/ResourceTypeInspection.java
+++ b/android/src/org/jetbrains/android/inspections/ResourceTypeInspection.java
@@ -362,8 +362,6 @@
String qualifiedName = annotation.getQualifiedName();
if (qualifiedName == null) {
continue;
- } else if (ApplicationManager.getApplication().isUnitTestMode() && qualifiedName.indexOf('.') == -1) {
- qualifiedName = SUPPORT_ANNOTATIONS_PREFIX + qualifiedName;
}
if (INT_DEF_ANNOTATION.equals(qualifiedName) || STRING_DEF_ANNOTATION.equals(qualifiedName)) {
diff --git a/android/testData/inspections/resourceType/flow/src/X.java b/android/testData/inspections/resourceType/flow/src/X.java
index 5901c13..62ec4cc 100644
--- a/android/testData/inspections/resourceType/flow/src/X.java
+++ b/android/testData/inspections/resourceType/flow/src/X.java
@@ -46,17 +46,17 @@
}
private static class MimeTypes {
- @StyleRes
- @DrawableRes
+ @android.support.annotation.StyleRes
+ @android.support.annotation.DrawableRes
public static int styleAndDrawable;
- @StyleRes
+ @android.support.annotation.StyleRes
public static int style;
- @DrawableRes
+ @android.support.annotation.DrawableRes
public static int drawable;
- @DrawableRes
+ @android.support.annotation.DrawableRes
public static int getIconForExt(String ext) {
return R.drawable.my_drawable;
}
@@ -71,12 +71,12 @@
return R.drawable.my_drawable;
}
- @StringRes
+ @android.support.annotation.StringRes
public static int getAnnotatedString() {
return R.string.my_string;
}
- @DrawableRes
+ @android.support.annotation.DrawableRes
public static int getAnnotatedDrawable() {
return R.drawable.my_drawable;
}
diff --git a/android/testData/inspections/resourceType/simple/src/X.java b/android/testData/inspections/resourceType/simple/src/X.java
index 2b899fb..7a1fadf 100644
--- a/android/testData/inspections/resourceType/simple/src/X.java
+++ b/android/testData/inspections/resourceType/simple/src/X.java
@@ -35,7 +35,7 @@
boolean error4 = resources.getBoolean(flow2);
}
- @DrawableRes
+ @android.support.annotation.DrawableRes
public int testResourceTypeReturnValues(Context context, boolean useString) {
if (useString) {
return R.string.app_name; // error
