Fix android synthetic properties compiler plugin tests

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/CliSyntheticFileGenerator.kt

@@ -25,6 +25,7 @@ import com.intellij.psi.impl.PsiElementFinderImpl
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.android.synthetic.AndroidXmlHandler
 import org.jetbrains.kotlin.android.synthetic.parseAndroidResource
+import org.jetbrains.kotlin.load.java.JavaClassFinder
 import org.jetbrains.kotlin.psi.JetFile
 
 public open class CliSyntheticFileGenerator(

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/SyntheticFileGenerator.kt

@@ -45,7 +45,7 @@ public abstract class SyntheticFileGenerator(protected val project: Project) {
 
     public abstract fun getSyntheticFiles(): List<JetFile>
 
-    protected fun generateSyntheticFiles(generateCommonFiles: Boolean, supportV4: Boolean): List<AndroidSyntheticFile> {
+    protected open fun generateSyntheticFiles(generateCommonFiles: Boolean, supportV4: Boolean): List<AndroidSyntheticFile> {
         val commonFiles = if (generateCommonFiles) generateCommonFiles(supportV4) else listOf()
 
         return layoutXmlFileManager.getLayoutXmlFiles().flatMap { entry ->

plugins/android-compiler-plugin/testData/android/converter/simple/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<manifest package="com.myapp">
+    <application/>
+</manifest>

plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/AndroidManifest.xml

@@ -1,33 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.myapp"
-          android:versionCode="1"
-          android:versionName="1.0" >
-
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-sdk
-            android:minSdkVersion="18"
-            android:targetSdkVersion="18" />
-    <permission android:name="android"></permission>
-
-    <application
-            android:allowBackup="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Sample" >
-        <activity
-                android:name="com.example.android.basiccontactables.MainActivity"
-                android:label="@string/app_name"
-                android:launchMode="singleTop">
-            <meta-data
-                    android:name="android.app.searchable"
-                    android:resource="@xml/searchable" />
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/get_LAYOUT.kt

@@ -1,38 +1,28 @@
 package kotlinx.android.synthetic.`get`
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.app.Activity.item_detail_container: ft<FrameLayout, FrameLayout?>
-    get() = findViewById(0) as? FrameLayout
+val android.app.Activity.item_detail_container: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = findViewById(0) as? android.widget.FrameLayout
 
-val android.app.Fragment.item_detail_container: ft<FrameLayout, FrameLayout?>
-    get() = getView().findViewById(0) as? FrameLayout
+val android.app.Fragment.item_detail_container: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = getView().findViewById(0) as? android.widget.FrameLayout
 
-val android.app.Activity.textView1: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.app.Activity.textView1: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.app.Fragment.textView1: ft<TextView, TextView?>
-    get() = getView().findViewById(0) as? TextView
+val android.app.Fragment.textView1: ft<android.widget.TextView, android.widget.TextView?>
+    get() = getView().findViewById(0) as? android.widget.TextView
 
-val android.app.Activity.password: ft<EditText, EditText?>
-    get() = findViewById(0) as? EditText
+val android.app.Activity.password: ft<android.widget.EditText, android.widget.EditText?>
+    get() = findViewById(0) as? android.widget.EditText
 
-val android.app.Fragment.password: ft<EditText, EditText?>
-    get() = getView().findViewById(0) as? EditText
+val android.app.Fragment.password: ft<android.widget.EditText, android.widget.EditText?>
+    get() = getView().findViewById(0) as? android.widget.EditText
 
-val android.app.Activity.login: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.app.Activity.login: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 
-val android.app.Fragment.login: ft<Button, Button?>
-    get() = getView().findViewById(0) as? Button
+val android.app.Fragment.login: ft<android.widget.Button, android.widget.Button?>
+    get() = getView().findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/get_VIEW.kt

@@ -1,26 +1,16 @@
 package kotlinx.android.synthetic.`get`.view
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.view.View.item_detail_container: ft<FrameLayout, FrameLayout?>
-    get() = findViewById(0) as? FrameLayout
+val android.view.View.item_detail_container: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = findViewById(0) as? android.widget.FrameLayout
 
-val android.view.View.textView1: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.view.View.textView1: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.view.View.password: ft<EditText, EditText?>
-    get() = findViewById(0) as? EditText
+val android.view.View.password: ft<android.widget.EditText, android.widget.EditText?>
+    get() = findViewById(0) as? android.widget.EditText
 
-val android.view.View.login: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.view.View.login: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/AndroidManifest.xml

@@ -1,33 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.myapp"
-          android:versionCode="1"
-          android:versionName="1.0" >
-
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-sdk
-            android:minSdkVersion="18"
-            android:targetSdkVersion="18" />
-    <permission android:name="android"></permission>
-
-    <application
-            android:allowBackup="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Sample" >
-        <activity
-                android:name="com.example.android.basiccontactables.MainActivity"
-                android:label="@string/app_name"
-                android:launchMode="singleTop">
-            <meta-data
-                    android:name="android.app.searchable"
-                    android:resource="@xml/searchable" />
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/res/layout/test.xml

@@ -6,10 +6,9 @@
              tools:ignore="MergeRootFrame" >
 
     <view
-        class="org.my.cool.Button"
-        android:id="@+id/MyButton"
+        class="android.inputmethodservice.KeyboardView"
+        android:id="@+id/MyKeyboardView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Sign in" />
+        android:layout_height="wrap_content"/>
 
 </FrameLayout>

plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/test_LAYOUT.kt

@@ -1,20 +1,10 @@
 package kotlinx.android.synthetic.test
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.app.Activity.MyButton: ft<org.my.cool.Button, org.my.cool.Button?>
-    get() = findViewById(0) as? org.my.cool.Button
+val android.app.Activity.MyKeyboardView: ft<android.inputmethodservice.KeyboardView, android.inputmethodservice.KeyboardView?>
+    get() = findViewById(0) as? android.inputmethodservice.KeyboardView
 
-val android.app.Fragment.MyButton: ft<org.my.cool.Button, org.my.cool.Button?>
-    get() = getView().findViewById(0) as? org.my.cool.Button
+val android.app.Fragment.MyKeyboardView: ft<android.inputmethodservice.KeyboardView, android.inputmethodservice.KeyboardView?>
+    get() = getView().findViewById(0) as? android.inputmethodservice.KeyboardView
 

plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/test_VIEW.kt

@@ -1,17 +1,7 @@
 package kotlinx.android.synthetic.test.view
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.view.View.MyButton: ft<org.my.cool.Button, org.my.cool.Button?>
-    get() = findViewById(0) as? org.my.cool.Button
+val android.view.View.MyKeyboardView: ft<android.inputmethodservice.KeyboardView, android.inputmethodservice.KeyboardView?>
+    get() = findViewById(0) as? android.inputmethodservice.KeyboardView
 

plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/AndroidManifest.xml

@@ -1,33 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.myapp"
-          android:versionCode="1"
-          android:versionName="1.0" >
-
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-sdk
-            android:minSdkVersion="18"
-            android:targetSdkVersion="18" />
-    <permission android:name="android"></permission>
-
-    <application
-            android:allowBackup="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Sample" >
-        <activity
-                android:name="com.example.android.basiccontactables.MainActivity"
-                android:label="@string/app_name"
-                android:launchMode="singleTop">
-            <meta-data
-                    android:name="android.app.searchable"
-                    android:resource="@xml/searchable" />
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/res/layout/test.xml

@@ -5,10 +5,9 @@
              tools:context=".ItemDetailActivity"
              tools:ignore="MergeRootFrame" >
 
-    <org.my.cool.Button
-        android:id="@+id/MyButton"
+    <android.inputmethodservice.KeyboardView
+        android:id="@+id/MyKeyboardView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Sign in" />
+        android:layout_height="wrap_content"/>
 
 </FrameLayout>

plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/test_LAYOUT.kt

@@ -1,20 +1,10 @@
 package kotlinx.android.synthetic.test
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.app.Activity.MyButton: ft<org.my.cool.Button, org.my.cool.Button?>
-    get() = findViewById(0) as? org.my.cool.Button
+val android.app.Activity.MyKeyboardView: ft<android.inputmethodservice.KeyboardView, android.inputmethodservice.KeyboardView?>
+    get() = findViewById(0) as? android.inputmethodservice.KeyboardView
 
-val android.app.Fragment.MyButton: ft<org.my.cool.Button, org.my.cool.Button?>
-    get() = getView().findViewById(0) as? org.my.cool.Button
+val android.app.Fragment.MyKeyboardView: ft<android.inputmethodservice.KeyboardView, android.inputmethodservice.KeyboardView?>
+    get() = getView().findViewById(0) as? android.inputmethodservice.KeyboardView
 

plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/test_VIEW.kt

@@ -1,17 +1,7 @@
 package kotlinx.android.synthetic.test.view
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.view.View.MyButton: ft<org.my.cool.Button, org.my.cool.Button?>
-    get() = findViewById(0) as? org.my.cool.Button
+val android.view.View.MyKeyboardView: ft<android.inputmethodservice.KeyboardView, android.inputmethodservice.KeyboardView?>
+    get() = findViewById(0) as? android.inputmethodservice.KeyboardView
 

plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/AndroidManifest.xml

@@ -1,33 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.myapp"
-          android:versionCode="1"
-          android:versionName="1.0" >
-
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-sdk
-            android:minSdkVersion="18"
-            android:targetSdkVersion="18" />
-    <permission android:name="android"></permission>
-
-    <application
-            android:allowBackup="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Sample" >
-        <activity
-                android:name="com.example.android.basiccontactables.MainActivity"
-                android:label="@string/app_name"
-                android:launchMode="singleTop">
-            <meta-data
-                    android:name="android.app.searchable"
-                    android:resource="@xml/searchable" />
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_LAYOUT.kt

@@ -1,20 +1,10 @@
 package kotlinx.android.synthetic.test
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.app.Activity.button: ft<View, View?>
-    get() = findViewById(0)
+val android.app.Activity.button: ft<android.view.View, android.view.View?>
+    get() = findViewById(0) as? android.view.View
 
-val android.app.Fragment.button: ft<View, View?>
-    get() = getView().findViewById(0)
+val android.app.Fragment.button: ft<android.view.View, android.view.View?>
+    get() = getView().findViewById(0) as? android.view.View
 

plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_VIEW.kt

@@ -1,17 +1,7 @@
 package kotlinx.android.synthetic.test.view
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.view.View.button: ft<View, View?>
-    get() = findViewById(0)
+val android.view.View.button: ft<android.view.View, android.view.View?>
+    get() = findViewById(0) as? android.view.View
 

plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/AndroidManifest.xml

@@ -1,33 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.myapp"
-          android:versionCode="1"
-          android:versionName="1.0" >
-
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-sdk
-            android:minSdkVersion="18"
-            android:targetSdkVersion="18" />
-    <permission android:name="android"></permission>
-
-    <application
-            android:allowBackup="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Sample" >
-        <activity
-                android:name="com.example.android.basiccontactables.MainActivity"
-                android:label="@string/app_name"
-                android:launchMode="singleTop">
-            <meta-data
-                    android:name="android.app.searchable"
-                    android:resource="@xml/searchable" />
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test1_LAYOUT.kt

@@ -1,38 +1,28 @@
 package kotlinx.android.synthetic.test1
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.app.Activity.frameLayout: ft<FrameLayout, FrameLayout?>
-    get() = findViewById(0) as? FrameLayout
+val android.app.Activity.frameLayout: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = findViewById(0) as? android.widget.FrameLayout
 
-val android.app.Fragment.frameLayout: ft<FrameLayout, FrameLayout?>
-    get() = getView().findViewById(0) as? FrameLayout
+val android.app.Fragment.frameLayout: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = getView().findViewById(0) as? android.widget.FrameLayout
 
-val android.app.Activity.passwordField: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.app.Activity.passwordField: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.app.Fragment.passwordField: ft<TextView, TextView?>
-    get() = getView().findViewById(0) as? TextView
+val android.app.Fragment.passwordField: ft<android.widget.TextView, android.widget.TextView?>
+    get() = getView().findViewById(0) as? android.widget.TextView
 
-val android.app.Activity.passwordCaption: ft<EditText, EditText?>
-    get() = findViewById(0) as? EditText
+val android.app.Activity.passwordCaption: ft<android.widget.EditText, android.widget.EditText?>
+    get() = findViewById(0) as? android.widget.EditText
 
-val android.app.Fragment.passwordCaption: ft<EditText, EditText?>
-    get() = getView().findViewById(0) as? EditText
+val android.app.Fragment.passwordCaption: ft<android.widget.EditText, android.widget.EditText?>
+    get() = getView().findViewById(0) as? android.widget.EditText
 
-val android.app.Activity.loginButton: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.app.Activity.loginButton: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 
-val android.app.Fragment.loginButton: ft<Button, Button?>
-    get() = getView().findViewById(0) as? Button
+val android.app.Fragment.loginButton: ft<android.widget.Button, android.widget.Button?>
+    get() = getView().findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test1_VIEW.kt

@@ -1,26 +1,16 @@
 package kotlinx.android.synthetic.test1.view
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.view.View.frameLayout: ft<FrameLayout, FrameLayout?>
-    get() = findViewById(0) as? FrameLayout
+val android.view.View.frameLayout: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = findViewById(0) as? android.widget.FrameLayout
 
-val android.view.View.passwordField: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.view.View.passwordField: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.view.View.passwordCaption: ft<EditText, EditText?>
-    get() = findViewById(0) as? EditText
+val android.view.View.passwordCaption: ft<android.widget.EditText, android.widget.EditText?>
+    get() = findViewById(0) as? android.widget.EditText
 
-val android.view.View.loginButton: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.view.View.loginButton: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test_LAYOUT.kt

@@ -1,38 +1,28 @@
 package kotlinx.android.synthetic.test
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.app.Activity.item_detail_container: ft<FrameLayout, FrameLayout?>
-    get() = findViewById(0) as? FrameLayout
+val android.app.Activity.item_detail_container: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = findViewById(0) as? android.widget.FrameLayout
 
-val android.app.Fragment.item_detail_container: ft<FrameLayout, FrameLayout?>
-    get() = getView().findViewById(0) as? FrameLayout
+val android.app.Fragment.item_detail_container: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = getView().findViewById(0) as? android.widget.FrameLayout
 
-val android.app.Activity.textView1: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.app.Activity.textView1: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.app.Fragment.textView1: ft<TextView, TextView?>
-    get() = getView().findViewById(0) as? TextView
+val android.app.Fragment.textView1: ft<android.widget.TextView, android.widget.TextView?>
+    get() = getView().findViewById(0) as? android.widget.TextView
 
-val android.app.Activity.password: ft<EditText, EditText?>
-    get() = findViewById(0) as? EditText
+val android.app.Activity.password: ft<android.widget.EditText, android.widget.EditText?>
+    get() = findViewById(0) as? android.widget.EditText
 
-val android.app.Fragment.password: ft<EditText, EditText?>
-    get() = getView().findViewById(0) as? EditText
+val android.app.Fragment.password: ft<android.widget.EditText, android.widget.EditText?>
+    get() = getView().findViewById(0) as? android.widget.EditText
 
-val android.app.Activity.login: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.app.Activity.login: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 
-val android.app.Fragment.login: ft<Button, Button?>
-    get() = getView().findViewById(0) as? Button
+val android.app.Fragment.login: ft<android.widget.Button, android.widget.Button?>
+    get() = getView().findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test_VIEW.kt

@@ -1,26 +1,16 @@
 package kotlinx.android.synthetic.test.view
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.view.View.item_detail_container: ft<FrameLayout, FrameLayout?>
-    get() = findViewById(0) as? FrameLayout
+val android.view.View.item_detail_container: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = findViewById(0) as? android.widget.FrameLayout
 
-val android.view.View.textView1: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.view.View.textView1: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.view.View.password: ft<EditText, EditText?>
-    get() = findViewById(0) as? EditText
+val android.view.View.password: ft<android.widget.EditText, android.widget.EditText?>
+    get() = findViewById(0) as? android.widget.EditText
 
-val android.view.View.login: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.view.View.login: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/noIds/AndroidManifest.xml

@@ -1,33 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.myapp"
-          android:versionCode="1"
-          android:versionName="1.0" >
-
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-sdk
-            android:minSdkVersion="18"
-            android:targetSdkVersion="18" />
-    <permission android:name="android"></permission>
-
-    <application
-            android:allowBackup="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Sample" >
-        <activity
-                android:name="com.example.android.basiccontactables.MainActivity"
-                android:label="@string/app_name"
-                android:launchMode="singleTop">
-            <meta-data
-                    android:name="android.app.searchable"
-                    android:resource="@xml/searchable" />
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

plugins/android-compiler-plugin/testData/android/converter/simple/noIds/test_LAYOUT.kt

@@ -1,14 +1,4 @@
 package kotlinx.android.synthetic.test
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 

plugins/android-compiler-plugin/testData/android/converter/simple/noIds/test_VIEW.kt

@@ -1,14 +1,4 @@
 package kotlinx.android.synthetic.test.view
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 

plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/AndroidManifest.xml

@@ -1,33 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.myapp"
-          android:versionCode="1"
-          android:versionName="1.0" >
-
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-sdk
-            android:minSdkVersion="18"
-            android:targetSdkVersion="18" />
-    <permission android:name="android"></permission>
-
-    <application
-            android:allowBackup="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Sample" >
-        <activity
-                android:name="com.example.android.basiccontactables.MainActivity"
-                android:label="@string/app_name"
-                android:launchMode="singleTop">
-            <meta-data
-                    android:name="android.app.searchable"
-                    android:resource="@xml/searchable" />
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_LAYOUT.kt

@@ -1,26 +1,16 @@
 package kotlinx.android.synthetic.test
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.app.Activity.textView1: ft<View, View?>
-    get() = findViewById(0)
+val android.app.Activity.textView1: ft<android.view.View, android.view.View?>
+    get() = findViewById(0) as? android.view.View
 
-val android.app.Fragment.textView1: ft<View, View?>
-    get() = getView().findViewById(0)
+val android.app.Fragment.textView1: ft<android.view.View, android.view.View?>
+    get() = getView().findViewById(0) as? android.view.View
 
-val android.app.Activity.textView2: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.app.Activity.textView2: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.app.Fragment.textView2: ft<TextView, TextView?>
-    get() = getView().findViewById(0) as? TextView
+val android.app.Fragment.textView2: ft<android.widget.TextView, android.widget.TextView?>
+    get() = getView().findViewById(0) as? android.widget.TextView
 

plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_VIEW.kt

@@ -1,20 +1,10 @@
 package kotlinx.android.synthetic.test.view
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.view.View.textView1: ft<View, View?>
-    get() = findViewById(0)
+val android.view.View.textView1: ft<android.view.View, android.view.View?>
+    get() = findViewById(0) as? android.view.View
 
-val android.view.View.textView2: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.view.View.textView2: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 

plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/AndroidManifest.xml

@@ -1,33 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.myapp"
-          android:versionCode="1"
-          android:versionName="1.0" >
-
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-sdk
-            android:minSdkVersion="18"
-            android:targetSdkVersion="18" />
-    <permission android:name="android"></permission>
-
-    <application
-            android:allowBackup="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Sample" >
-        <activity
-                android:name="com.example.android.basiccontactables.MainActivity"
-                android:label="@string/app_name"
-                android:launchMode="singleTop">
-            <meta-data
-                    android:name="android.app.searchable"
-                    android:resource="@xml/searchable" />
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_LAYOUT.kt

@@ -1,32 +1,22 @@
 package kotlinx.android.synthetic.test
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.app.Activity.button: ft<View, View?>
-    get() = findViewById(0)
+val android.app.Activity.button: ft<android.view.View, android.view.View?>
+    get() = findViewById(0) as? android.view.View
 
-val android.app.Fragment.button: ft<View, View?>
-    get() = getView().findViewById(0)
+val android.app.Fragment.button: ft<android.view.View, android.view.View?>
+    get() = getView().findViewById(0) as? android.view.View
 
-val android.app.Activity.button2: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.app.Activity.button2: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 
-val android.app.Fragment.button2: ft<Button, Button?>
-    get() = getView().findViewById(0) as? Button
+val android.app.Fragment.button2: ft<android.widget.Button, android.widget.Button?>
+    get() = getView().findViewById(0) as? android.widget.Button
 
-val android.app.Activity.button3: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.app.Activity.button3: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 
-val android.app.Fragment.button3: ft<Button, Button?>
-    get() = getView().findViewById(0) as? Button
+val android.app.Fragment.button3: ft<android.widget.Button, android.widget.Button?>
+    get() = getView().findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_VIEW.kt

@@ -1,23 +1,13 @@
 package kotlinx.android.synthetic.test.view
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.view.View.button: ft<View, View?>
-    get() = findViewById(0)
+val android.view.View.button: ft<android.view.View, android.view.View?>
+    get() = findViewById(0) as? android.view.View
 
-val android.view.View.button2: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.view.View.button2: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 
-val android.view.View.button3: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.view.View.button3: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/AndroidManifest.xml

@@ -1,33 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.myapp"
-          android:versionCode="1"
-          android:versionName="1.0" >
-
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-sdk
-            android:minSdkVersion="18"
-            android:targetSdkVersion="18" />
-    <permission android:name="android"></permission>
-
-    <application
-            android:allowBackup="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Sample" >
-        <activity
-                android:name="com.example.android.basiccontactables.MainActivity"
-                android:label="@string/app_name"
-                android:launchMode="singleTop">
-            <meta-data
-                    android:name="android.app.searchable"
-                    android:resource="@xml/searchable" />
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/test_LAYOUT.kt

@@ -1,38 +1,28 @@
 package kotlinx.android.synthetic.test
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.app.Activity.item_detail_container: ft<FrameLayout, FrameLayout?>
-    get() = findViewById(0) as? FrameLayout
+val android.app.Activity.item_detail_container: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = findViewById(0) as? android.widget.FrameLayout
 
-val android.app.Fragment.item_detail_container: ft<FrameLayout, FrameLayout?>
-    get() = getView().findViewById(0) as? FrameLayout
+val android.app.Fragment.item_detail_container: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = getView().findViewById(0) as? android.widget.FrameLayout
 
-val android.app.Activity.textView1: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.app.Activity.textView1: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.app.Fragment.textView1: ft<TextView, TextView?>
-    get() = getView().findViewById(0) as? TextView
+val android.app.Fragment.textView1: ft<android.widget.TextView, android.widget.TextView?>
+    get() = getView().findViewById(0) as? android.widget.TextView
 
-val android.app.Activity.password: ft<EditText, EditText?>
-    get() = findViewById(0) as? EditText
+val android.app.Activity.password: ft<android.widget.EditText, android.widget.EditText?>
+    get() = findViewById(0) as? android.widget.EditText
 
-val android.app.Fragment.password: ft<EditText, EditText?>
-    get() = getView().findViewById(0) as? EditText
+val android.app.Fragment.password: ft<android.widget.EditText, android.widget.EditText?>
+    get() = getView().findViewById(0) as? android.widget.EditText
 
-val android.app.Activity.login: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.app.Activity.login: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 
-val android.app.Fragment.login: ft<Button, Button?>
-    get() = getView().findViewById(0) as? Button
+val android.app.Fragment.login: ft<android.widget.Button, android.widget.Button?>
+    get() = getView().findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/test_VIEW.kt

@@ -1,26 +1,16 @@
 package kotlinx.android.synthetic.test.view
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.view.View.item_detail_container: ft<FrameLayout, FrameLayout?>
-    get() = findViewById(0) as? FrameLayout
+val android.view.View.item_detail_container: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = findViewById(0) as? android.widget.FrameLayout
 
-val android.view.View.textView1: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.view.View.textView1: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.view.View.password: ft<EditText, EditText?>
-    get() = findViewById(0) as? EditText
+val android.view.View.password: ft<android.widget.EditText, android.widget.EditText?>
+    get() = findViewById(0) as? android.widget.EditText
 
-val android.view.View.login: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.view.View.login: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/AndroidManifest.xml

@@ -1,33 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.myapp"
-          android:versionCode="1"
-          android:versionName="1.0" >
-
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-sdk
-            android:minSdkVersion="18"
-            android:targetSdkVersion="18" />
-    <permission android:name="android"></permission>
-
-    <application
-            android:allowBackup="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Sample" >
-        <activity
-                android:name="com.example.android.basiccontactables.MainActivity"
-                android:label="@string/app_name"
-                android:launchMode="singleTop">
-            <meta-data
-                    android:name="android.app.searchable"
-                    android:resource="@xml/searchable" />
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_LAYOUT.kt

@@ -1,22 +1,12 @@
 package kotlinx.android.synthetic.test
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.app.Activity.includeTag: ft<View, View?>
-    get() = findViewById(0)
+val android.app.Activity.includeTag: ft<android.view.View, android.view.View?>
+    get() = findViewById(0) as? android.view.View
 
-val android.app.Fragment.includeTag: ft<View, View?>
-    get() = getView().findViewById(0)
+val android.app.Fragment.includeTag: ft<android.view.View, android.view.View?>
+    get() = getView().findViewById(0) as? android.view.View
 
 val android.app.Activity.fragmentTag: ft<android.app.Fragment, android.app.Fragment?>
     get() = getFragmentManager().findFragmentById(0) as? android.app.Fragment
@@ -24,15 +14,15 @@ val android.app.Activity.fragmentTag: ft<android.app.Fragment, android.app.Fragm
 val android.app.Fragment.fragmentTag: ft<android.app.Fragment, android.app.Fragment?>
     get() = getFragmentManager().findFragmentById(0) as? android.app.Fragment
 
-val android.app.Activity.`fun`: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.app.Activity.`fun`: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.app.Fragment.`fun`: ft<TextView, TextView?>
-    get() = getView().findViewById(0) as? TextView
+val android.app.Fragment.`fun`: ft<android.widget.TextView, android.widget.TextView?>
+    get() = getView().findViewById(0) as? android.widget.TextView
 
-val android.app.Activity.`set`: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.app.Activity.`set`: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 
-val android.app.Fragment.`set`: ft<Button, Button?>
-    get() = getView().findViewById(0) as? Button
+val android.app.Fragment.`set`: ft<android.widget.Button, android.widget.Button?>
+    get() = getView().findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_VIEW.kt

@@ -1,23 +1,13 @@
 package kotlinx.android.synthetic.test.view
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.view.View.includeTag: ft<View, View?>
-    get() = findViewById(0)
+val android.view.View.includeTag: ft<android.view.View, android.view.View?>
+    get() = findViewById(0) as? android.view.View
 
-val android.view.View.`fun`: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.view.View.`fun`: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.view.View.`set`: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.view.View.`set`: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/AndroidManifest.xml

@@ -1,33 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.myapp"
-          android:versionCode="1"
-          android:versionName="1.0" >
-
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-sdk
-            android:minSdkVersion="18"
-            android:targetSdkVersion="18" />
-    <permission android:name="android"></permission>
-
-    <application
-            android:allowBackup="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Sample" >
-        <activity
-                android:name="com.example.android.basiccontactables.MainActivity"
-                android:label="@string/app_name"
-                android:launchMode="singleTop">
-            <meta-data
-                    android:name="android.app.searchable"
-                    android:resource="@xml/searchable" />
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/test_LAYOUT.kt

@@ -1,50 +1,40 @@
 package kotlinx.android.synthetic.test
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.app.Activity.item_detail_container: ft<FrameLayout, FrameLayout?>
-    get() = findViewById(0) as? FrameLayout
+val android.app.Activity.item_detail_container: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = findViewById(0) as? android.widget.FrameLayout
 
-val android.app.Fragment.item_detail_container: ft<FrameLayout, FrameLayout?>
-    get() = getView().findViewById(0) as? FrameLayout
+val android.app.Fragment.item_detail_container: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = getView().findViewById(0) as? android.widget.FrameLayout
 
-val android.support.v4.app.Fragment.item_detail_container: ft<FrameLayout, FrameLayout?>
-    get() = getView().findViewById(0) as? FrameLayout
+val android.support.v4.app.Fragment.item_detail_container: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = getView().findViewById(0) as? android.widget.FrameLayout
 
-val android.app.Activity.textView1: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.app.Activity.textView1: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.app.Fragment.textView1: ft<TextView, TextView?>
-    get() = getView().findViewById(0) as? TextView
+val android.app.Fragment.textView1: ft<android.widget.TextView, android.widget.TextView?>
+    get() = getView().findViewById(0) as? android.widget.TextView
 
-val android.support.v4.app.Fragment.textView1: ft<TextView, TextView?>
-    get() = getView().findViewById(0) as? TextView
+val android.support.v4.app.Fragment.textView1: ft<android.widget.TextView, android.widget.TextView?>
+    get() = getView().findViewById(0) as? android.widget.TextView
 
-val android.app.Activity.password: ft<EditText, EditText?>
-    get() = findViewById(0) as? EditText
+val android.app.Activity.password: ft<android.widget.EditText, android.widget.EditText?>
+    get() = findViewById(0) as? android.widget.EditText
 
-val android.app.Fragment.password: ft<EditText, EditText?>
-    get() = getView().findViewById(0) as? EditText
+val android.app.Fragment.password: ft<android.widget.EditText, android.widget.EditText?>
+    get() = getView().findViewById(0) as? android.widget.EditText
 
-val android.support.v4.app.Fragment.password: ft<EditText, EditText?>
-    get() = getView().findViewById(0) as? EditText
+val android.support.v4.app.Fragment.password: ft<android.widget.EditText, android.widget.EditText?>
+    get() = getView().findViewById(0) as? android.widget.EditText
 
-val android.app.Activity.login: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.app.Activity.login: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 
-val android.app.Fragment.login: ft<Button, Button?>
-    get() = getView().findViewById(0) as? Button
+val android.app.Fragment.login: ft<android.widget.Button, android.widget.Button?>
+    get() = getView().findViewById(0) as? android.widget.Button
 
-val android.support.v4.app.Fragment.login: ft<Button, Button?>
-    get() = getView().findViewById(0) as? Button
+val android.support.v4.app.Fragment.login: ft<android.widget.Button, android.widget.Button?>
+    get() = getView().findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/test_VIEW.kt

@@ -1,26 +1,16 @@
 package kotlinx.android.synthetic.test.view
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.view.View.item_detail_container: ft<FrameLayout, FrameLayout?>
-    get() = findViewById(0) as? FrameLayout
+val android.view.View.item_detail_container: ft<android.widget.FrameLayout, android.widget.FrameLayout?>
+    get() = findViewById(0) as? android.widget.FrameLayout
 
-val android.view.View.textView1: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.view.View.textView1: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.view.View.password: ft<EditText, EditText?>
-    get() = findViewById(0) as? EditText
+val android.view.View.password: ft<android.widget.EditText, android.widget.EditText?>
+    get() = findViewById(0) as? android.widget.EditText
 
-val android.view.View.login: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.view.View.login: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/AndroidManifest.xml

@@ -1,33 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.myapp"
-          android:versionCode="1"
-          android:versionName="1.0" >
-
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-sdk
-            android:minSdkVersion="18"
-            android:targetSdkVersion="18" />
-    <permission android:name="android"></permission>
-
-    <application
-            android:allowBackup="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Sample" >
-        <activity
-                android:name="com.example.android.basiccontactables.MainActivity"
-                android:label="@string/app_name"
-                android:launchMode="singleTop">
-            <meta-data
-                    android:name="android.app.searchable"
-                    android:resource="@xml/searchable" />
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_LAYOUT.kt

@@ -1,25 +1,15 @@
 package kotlinx.android.synthetic.test
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.app.Activity.includeTag: ft<View, View?>
-    get() = findViewById(0)
+val android.app.Activity.includeTag: ft<android.view.View, android.view.View?>
+    get() = findViewById(0) as? android.view.View
 
-val android.app.Fragment.includeTag: ft<View, View?>
-    get() = getView().findViewById(0)
+val android.app.Fragment.includeTag: ft<android.view.View, android.view.View?>
+    get() = getView().findViewById(0) as? android.view.View
 
-val android.support.v4.app.Fragment.includeTag: ft<View, View?>
-    get() = getView().findViewById(0)
+val android.support.v4.app.Fragment.includeTag: ft<android.view.View, android.view.View?>
+    get() = getView().findViewById(0) as? android.view.View
 
 val android.app.Activity.fragmentTag: ft<android.app.Fragment, android.app.Fragment?>
     get() = getFragmentManager().findFragmentById(0) as? android.app.Fragment
@@ -33,21 +23,21 @@ val android.support.v4.app.Fragment.fragmentTag: ft<android.support.v4.app.Fragm
 val android.support.v4.app.FragmentActivity.fragmentTag: ft<android.support.v4.app.Fragment, android.support.v4.app.Fragment?>
     get() = getSupportFragmentManager().findFragmentById(0) as? android.support.v4.app.Fragment
 
-val android.app.Activity.`fun`: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.app.Activity.`fun`: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.app.Fragment.`fun`: ft<TextView, TextView?>
-    get() = getView().findViewById(0) as? TextView
+val android.app.Fragment.`fun`: ft<android.widget.TextView, android.widget.TextView?>
+    get() = getView().findViewById(0) as? android.widget.TextView
 
-val android.support.v4.app.Fragment.`fun`: ft<TextView, TextView?>
-    get() = getView().findViewById(0) as? TextView
+val android.support.v4.app.Fragment.`fun`: ft<android.widget.TextView, android.widget.TextView?>
+    get() = getView().findViewById(0) as? android.widget.TextView
 
-val android.app.Activity.`set`: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.app.Activity.`set`: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 
-val android.app.Fragment.`set`: ft<Button, Button?>
-    get() = getView().findViewById(0) as? Button
+val android.app.Fragment.`set`: ft<android.widget.Button, android.widget.Button?>
+    get() = getView().findViewById(0) as? android.widget.Button
 
-val android.support.v4.app.Fragment.`set`: ft<Button, Button?>
-    get() = getView().findViewById(0) as? Button
+val android.support.v4.app.Fragment.`set`: ft<android.widget.Button, android.widget.Button?>
+    get() = getView().findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_VIEW.kt

@@ -1,23 +1,13 @@
 package kotlinx.android.synthetic.test.view
 
-import android.app.*
-import android.view.*
-import android.widget.*
-import android.webkit.*
-import android.inputmethodservice.*
-import android.opengl.*
-import android.appwidget.*
-import android.support.v4.app.*
-import android.support.v4.view.*
-import android.support.v4.widget.*
 import kotlin.internal.flexible.ft
 
-val android.view.View.includeTag: ft<View, View?>
-    get() = findViewById(0)
+val android.view.View.includeTag: ft<android.view.View, android.view.View?>
+    get() = findViewById(0) as? android.view.View
 
-val android.view.View.`fun`: ft<TextView, TextView?>
-    get() = findViewById(0) as? TextView
+val android.view.View.`fun`: ft<android.widget.TextView, android.widget.TextView?>
+    get() = findViewById(0) as? android.widget.TextView
 
-val android.view.View.`set`: ft<Button, Button?>
-    get() = findViewById(0) as? Button
+val android.view.View.`set`: ft<android.widget.Button, android.widget.Button?>
+    get() = findViewById(0) as? android.widget.Button
 

plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/res/layout/test.xml

@@ -0,0 +1,13 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             tools:context=".ItemDetailActivity"
+             tools:ignore="MergeRootFrame" >
+
+    <a.b.c
+        android:id="@+id/MyView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</FrameLayout>

plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/test_LAYOUT.kt

@@ -0,0 +1,12 @@
+package kotlinx.android.synthetic.test
+
+import kotlin.internal.flexible.ft
+
+@kotlin.internal.flexible.InvalidWidgetType("a.b.c")
+val android.app.Activity.MyView: ft<android.view.View, android.view.View?>
+    get() = findViewById(0) as? android.view.View
+
+@kotlin.internal.flexible.InvalidWidgetType("a.b.c")
+val android.app.Fragment.MyView: ft<android.view.View, android.view.View?>
+    get() = getView().findViewById(0) as? android.view.View
+

plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/test_VIEW.kt

@@ -0,0 +1,8 @@
+package kotlinx.android.synthetic.test.view
+
+import kotlin.internal.flexible.ft
+
+@kotlin.internal.flexible.InvalidWidgetType("a.b.c")
+val android.view.View.MyView: ft<android.view.View, android.view.View?>
+    get() = findViewById(0) as? android.view.View
+

plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/res/layout/test.xml

@@ -0,0 +1,13 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             tools:context=".ItemDetailActivity"
+             tools:ignore="MergeRootFrame" >
+
+    <KeyboardView
+        android:id="@+id/MyKeyboardView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</FrameLayout>

plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/test_LAYOUT.kt

@@ -0,0 +1,12 @@
+package kotlinx.android.synthetic.test
+
+import kotlin.internal.flexible.ft
+
+@kotlin.internal.flexible.InvalidWidgetType("KeyboardView")
+val android.app.Activity.MyKeyboardView: ft<android.view.View, android.view.View?>
+    get() = findViewById(0) as? android.view.View
+
+@kotlin.internal.flexible.InvalidWidgetType("KeyboardView")
+val android.app.Fragment.MyKeyboardView: ft<android.view.View, android.view.View?>
+    get() = getView().findViewById(0) as? android.view.View
+

plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/test_VIEW.kt

@@ -0,0 +1,8 @@
+package kotlinx.android.synthetic.test.view
+
+import kotlin.internal.flexible.ft
+
+@kotlin.internal.flexible.InvalidWidgetType("KeyboardView")
+val android.view.View.MyKeyboardView: ft<android.view.View, android.view.View?>
+    get() = findViewById(0) as? android.view.View
+

plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt

@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.lang.resolve.android.test
 
-import com.intellij.openapi.module.ModuleManager
 import com.intellij.testFramework.UsefulTestCase
 import org.jetbrains.kotlin.android.synthetic.res.SyntheticFileGenerator
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
@@ -38,7 +37,7 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() {
         val layoutPaths = getResPaths(path)
         val supportV4 = testDirectory.name.startsWith("support")
         val parser = CliSyntheticFileGeneratorForConversionTest(
-                jetCoreEnvironment.project, path + "AndroidManifest.xml", layoutPaths, supportV4)
+                jetCoreEnvironment.project, File(testDirectory.parent, "AndroidManifest.xml").path, layoutPaths, supportV4)
 
         val actual = parser.gen().toMap { it.name }
 
@@ -65,7 +64,7 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() {
     }
 
     private fun getEnvironment(): KotlinCoreEnvironment {
-        val configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK)
+        val configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.ANDROID_API)
         return KotlinCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
     }
 }

plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java

@@ -108,6 +108,18 @@ public class AndroidXml2KConversionTestGenerated extends AbstractAndroidXml2KCon
             String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/");
             doTest(fileName);
         }
+
+        @TestMetadata("unresolvedFqName")
+        public void testUnresolvedFqName() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("unresolvedWidget")
+        public void testUnresolvedWidget() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/");
+            doTest(fileName);
+        }
     }
 
     @TestMetadata("plugins/android-compiler-plugin/testData/android/converter/exceptions")

plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt

@@ -21,6 +21,7 @@ import com.intellij.testFramework.UsefulTestCase
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.android.synthetic.AndroidConfigurationKeys
 import org.jetbrains.kotlin.android.synthetic.codegen.AndroidExpressionCodegenExtension
+import org.jetbrains.kotlin.android.synthetic.res.AndroidSyntheticFile
 import org.jetbrains.kotlin.android.synthetic.res.CliSyntheticFileGenerator
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
@@ -48,7 +49,12 @@ class CliSyntheticFileGeneratorForConversionTest(
         resDirectories: List<String>,
         private val supportV4: Boolean
 ) : CliSyntheticFileGenerator(project, manifestPath, resDirectories) {
+
     fun gen() = generateSyntheticFiles(false, supportV4)
+
+    public override fun generateSyntheticFiles(generateCommonFiles: Boolean, supportV4: Boolean): List<AndroidSyntheticFile> {
+        return super.generateSyntheticFiles(generateCommonFiles, this.supportV4)
+    }
 }
 
 fun UsefulTestCase.createAndroidTestEnvironment(