Implement quickfixes for Android Lint api issues

#KT-16624 Fixed
#KT-16625 Fixed
#KT-14947 Fixed

GitOrigin-RevId: 811acf15b3ce01c8a491f68402e0e5d84f2f3137

plugins/kotlin/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -24,10 +24,10 @@ import org.jetbrains.kotlin.allopen.AbstractBytecodeListingTestForAllOpen
 import org.jetbrains.kotlin.android.*
 import org.jetbrains.kotlin.android.configure.AbstractConfigureProjectTest
 import org.jetbrains.kotlin.android.folding.AbstractAndroidResourceFoldingTest
-import org.jetbrains.kotlin.android.intentions.AbstractAndroidIntentionTest
-import org.jetbrains.kotlin.android.intentions.AbstractAndroidResourceIntentionTest
+import org.jetbrains.kotlin.android.quickfix.AbstractAndroidLintQuickfixTest
+import org.jetbrains.kotlin.android.intention.AbstractAndroidResourceIntentionTest
 import org.jetbrains.kotlin.android.lint.AbstractKotlinLintTest
-import org.jetbrains.kotlin.android.quickfixes.AbstractAndroidQuickFixMultiFileTest
+import org.jetbrains.kotlin.android.quickfix.AbstractAndroidQuickFixMultiFileTest
 import org.jetbrains.kotlin.annotation.AbstractAnnotationProcessorBoxTest
 import org.jetbrains.kotlin.annotation.processing.test.sourceRetention.AbstractBytecodeListingTestForSourceRetention
 import org.jetbrains.kotlin.annotation.processing.test.wrappers.AbstractAnnotationProcessingTest
@@ -1209,7 +1209,7 @@ fun main(args: Array<String>) {
         }
 
         testClass<AbstractAndroidResourceIntentionTest> {
-            model("android/resourceIntentions", extension = "test", singleClass = true)
+            model("android/resourceIntention", extension = "test", singleClass = true)
         }
 
         testClass<AbstractAndroidQuickFixMultiFileTest> {
@@ -1220,8 +1220,8 @@ fun main(args: Array<String>) {
             model("android/lint", excludeParentDirs = true)
         }
 
-        testClass<AbstractAndroidIntentionTest> {
-            model("android/intentions", pattern = "^([\\w\\-_]+)\\.kt$")
+        testClass<AbstractAndroidLintQuickfixTest> {
+            model("android/lintQuickfix", pattern = "^([\\w\\-_]+)\\.kt$")
         }
 
         testClass<AbstractAndroidResourceFoldingTest> {

plugins/kotlin/idea/src/META-INF/android.xml

@@ -19,7 +19,7 @@
         <editorNotificationProvider implementation="org.jetbrains.kotlin.android.actions.KotlinNewActivityNotification"/>
 
         <intentionAction>
-            <className>org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource</className>
+            <className>org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource</className>
             <category>Kotlin Android</category>
         </intentionAction>
 

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/RequiresApi.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.support.annotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+
+import static java.lang.annotation.RetentionPolicy.CLASS;
+
+/**
+ * Denotes that the annotated element should only be called on the given API level
+ * or higher.
+ * <p>
+ * This is similar in purpose to the older {@code @TargetApi} annotation, but more
+ * clearly expresses that this is a requirement on the caller, rather than being
+ * used to "suppress" warnings within the method that exceed the {@code minSdkVersion}.
+ */
+@Retention(CLASS)
+@Target({TYPE,METHOD,CONSTRUCTOR,FIELD})
+public @interface RequiresApi {
+    /**
+     * The API level to require. Alias for {@link #api} which allows you to leave out the
+     * {@code api=} part.
+     */
+    @IntRange(from=1)
+    int value() default 1;
+
+    /** The API level to require */
+    @IntRange(from=1)
+    int api() default 1;
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import kotlin.reflect.KClass
+
+annotation class SomeAnnotationWithClass(val cls: KClass<*>)
+
+@SomeAnnotationWithClass(<caret>VectorDrawable::class)
+class VectorDrawableProvider {
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected

@@ -0,0 +1,15 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+import kotlin.reflect.KClass
+
+annotation class SomeAnnotationWithClass(val cls: KClass<*>)
+
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+@SomeAnnotationWithClass(VectorDrawable::class)
+class VectorDrawableProvider {
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/companion.kt

@@ -0,0 +1,11 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    companion object {
+        val VECTOR_DRAWABLE = <caret>VectorDrawable()
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/companion.kt.expected

@@ -0,0 +1,14 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+class VectorDrawableProvider {
+    companion object {
+        @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+        val VECTOR_DRAWABLE = VectorDrawable()
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/defaultParameter.kt

@@ -0,0 +1,10 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+
+
+fun withDefaultParameter(vector: VectorDrawable = <caret>VectorDrawable()) {
+
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/defaultParameter.kt.expected

@@ -0,0 +1,13 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+fun withDefaultParameter(vector: VectorDrawable = VectorDrawable()) {
+
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/extend.kt

@@ -0,0 +1,9 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+
+class MyVectorDrawable : <caret>VectorDrawable() {
+
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/extend.kt.expected

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+class MyVectorDrawable : VectorDrawable() {
+
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/functionLiteral.kt

@@ -0,0 +1,13 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        with(this) {
+            return <caret>VectorDrawable()
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/functionLiteral.kt.expected

@@ -0,0 +1,16 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+class VectorDrawableProvider {
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    fun getVectorDrawable(): VectorDrawable {
+        with(this) {
+            return VectorDrawable()
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/method.kt

@@ -0,0 +1,11 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        return <caret>VectorDrawable()
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/method.kt.expected

@@ -0,0 +1,14 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+class VectorDrawableProvider {
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    fun getVectorDrawable(): VectorDrawable {
+        return VectorDrawable()
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/property.kt

@@ -0,0 +1,9 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    val VECTOR_DRAWABLE = <caret>VectorDrawable()
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/property.kt.expected

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+class VectorDrawableProvider {
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    val VECTOR_DRAWABLE = VectorDrawable()
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/when.kt

@@ -0,0 +1,15 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        return when (flag) {
+            true -> <caret>VectorDrawable()
+            else -> VectorDrawable()
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/when.kt.expected

@@ -0,0 +1,18 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+class VectorDrawableProvider {
+    val flag = false
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    fun getVectorDrawable(): VectorDrawable {
+        return when (flag) {
+            true -> VectorDrawable()
+            else -> VectorDrawable()
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt

@@ -0,0 +1,11 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import kotlin.reflect.KClass
+
+annotation class SomeAnnotationWithClass(val cls: KClass<*>)
+
+@SomeAnnotationWithClass(<caret>VectorDrawable::class)
+class VectorDrawableProvider {
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected

@@ -0,0 +1,14 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import kotlin.reflect.KClass
+
+annotation class SomeAnnotationWithClass(val cls: KClass<*>)
+
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+@SomeAnnotationWithClass(VectorDrawable::class)
+class VectorDrawableProvider {
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/companion.kt

@@ -0,0 +1,10 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    companion object {
+        val VECTOR_DRAWABLE = <caret>VectorDrawable()
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/companion.kt.expected

@@ -0,0 +1,13 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    companion object {
+        val VECTOR_DRAWABLE = VectorDrawable()
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/defaultParameter.kt

@@ -0,0 +1,9 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+
+fun withDefaultParameter(vector: VectorDrawable = <caret>VectorDrawable()) {
+
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/defaultParameter.kt.expected

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+fun withDefaultParameter(vector: VectorDrawable = VectorDrawable()) {
+
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/extend.kt

@@ -0,0 +1,8 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class MyVectorDrawable : <caret>VectorDrawable() {
+
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/extend.kt.expected

@@ -0,0 +1,11 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+class MyVectorDrawable : VectorDrawable() {
+
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/functionLiteral.kt

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        with(this) {
+            return <caret>VectorDrawable()
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/functionLiteral.kt.expected

@@ -0,0 +1,15 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    fun getVectorDrawable(): VectorDrawable {
+        with(this) {
+            return VectorDrawable()
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/method.kt

@@ -0,0 +1,10 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        return <caret>VectorDrawable()
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/method.kt.expected

@@ -0,0 +1,13 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    fun getVectorDrawable(): VectorDrawable {
+        return VectorDrawable()
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/property.kt

@@ -0,0 +1,8 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    val VECTOR_DRAWABLE = <caret>VectorDrawable()
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/property.kt.expected

@@ -0,0 +1,11 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+class VectorDrawableProvider {
+    val VECTOR_DRAWABLE = VectorDrawable()
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/when.kt

@@ -0,0 +1,14 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        return when (flag) {
+            true -> <caret>VectorDrawable()
+            else -> VectorDrawable()
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/when.kt.expected

@@ -0,0 +1,17 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    val flag = false
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    fun getVectorDrawable(): VectorDrawable {
+        return when (flag) {
+            true -> VectorDrawable()
+            else -> VectorDrawable()
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/annotation.kt

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INTENTION_NOT_AVAILABLE
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import kotlin.reflect.KClass
+
+annotation class SomeAnnotationWithClass(val cls: KClass<*>)
+
+@SomeAnnotationWithClass(<caret>VectorDrawable::class)
+class VectorDrawableProvider {
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/defaultParameter.kt

@@ -0,0 +1,10 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INTENTION_NOT_AVAILABLE
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+
+fun withDefaultParameter(vector: VectorDrawable = <caret>VectorDrawable()) {
+
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/expressionBody.kt

@@ -0,0 +1,8 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable = <caret>VectorDrawable()
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/expressionBody.kt.expected

@@ -0,0 +1,11 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        VectorDrawable()
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/functionLiteral.kt

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        with(this) {
+            return <caret>VectorDrawable()
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/functionLiteral.kt.expected

@@ -0,0 +1,15 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        with(this) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                return VectorDrawable()
+            }
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/if.kt

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        if (flag)
+            return <caret>VectorDrawable()
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/if.kt.expected

@@ -0,0 +1,15 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        if (flag)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                return VectorDrawable()
+            }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/ifWithBlock.kt

@@ -0,0 +1,13 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        if (flag) {
+            return <caret>VectorDrawable()
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/ifWithBlock.kt.expected

@@ -0,0 +1,16 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        if (flag) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                return VectorDrawable()
+            }
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/method.kt

@@ -0,0 +1,10 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        return <caret>VectorDrawable()
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/method.kt.expected

@@ -0,0 +1,13 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            return VectorDrawable()
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/when.kt

@@ -0,0 +1,14 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        return when (flag) {
+            true -> <caret>VectorDrawable()
+            else -> VectorDrawable()
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/when.kt.expected

@@ -0,0 +1,17 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        return when (flag) {
+            true -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                VectorDrawable()
+            }
+            else -> VectorDrawable()
+        }
+    }
+}

plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/activityExtension.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}

plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/activityMethod.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}