76262: False warning in onClick when associated method is in a superclass

Change-Id: I9c9ec7d87c6a52ccd99a224c5365cb5062d19739

6 files changed, 58 insertions, 1 deletions

diff --git a/android/testData/dom/layout/OnClickActivity7.java b/android/testData/dom/layout/OnClickActivity7.java
new file mode 100644
index 00000000000..ba411a7c49c
--- /dev/null
+++ b/android/testData/dom/layout/OnClickActivity7.java
@@ -0,0 +1,12 @@
+package p1.p2;
+
+import android.view.View;
+
+public abstract class Activity1 extends android.app.Activity {
+
+  public void clickHandler1(View view) {
+  }
+
+  public void clickHandler2() {
+  }
+}
diff --git a/android/testData/dom/layout/OnClickActivity8.java b/android/testData/dom/layout/OnClickActivity8.java
new file mode 100644
index 00000000000..8171693512a
--- /dev/null
+++ b/android/testData/dom/layout/OnClickActivity8.java
@@ -0,0 +1,8 @@
+package p1.p2;
+
+public class Activity2 extends Activity1 {
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.onClickHighlighting5);
+  }
+}
diff --git a/android/testData/dom/layout/OnClickActivity9.java b/android/testData/dom/layout/OnClickActivity9.java
new file mode 100644
index 00000000000..29c01a3d41a
--- /dev/null
+++ b/android/testData/dom/layout/OnClickActivity9.java
@@ -0,0 +1,7 @@
+package p1.p2;
+
+public class Activity2 extends Activity1 {
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+  }
+}
diff --git a/android/testData/dom/layout/onClickHighlighting5.xml b/android/testData/dom/layout/onClickHighlighting5.xml
new file mode 100644
index 00000000000..dafa52589fd
--- /dev/null
+++ b/android/testData/dom/layout/onClickHighlighting5.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    tools:context=".Activity2">
+<TextView  
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:onClick="clickHandler1"/>
+  <TextView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:onClick="<warning descr="Method 'clickHandler2' is missing in 'Activity2' or has incorrect signature">clickHandler2</warning>"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/android/testData/dom/layout/onClickHighlighting6.xml b/android/testData/dom/layout/onClickHighlighting6.xml
new file mode 100644
index 00000000000..dafa52589fd
--- /dev/null
+++ b/android/testData/dom/layout/onClickHighlighting6.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    tools:context=".Activity2">
+<TextView  
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:onClick="clickHandler1"/>
+  <TextView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:onClick="<warning descr="Method 'clickHandler2' is missing in 'Activity2' or has incorrect signature">clickHandler2</warning>"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/android/testData/lint/obsoleteDependency_after.gradle b/android/testData/lint/obsoleteDependency_after.gradle
index 5c826a95b7e..5cdf89d6b3f 100644
--- a/android/testData/lint/obsoleteDependency_after.gradle
+++ b/android/testData/lint/obsoleteDependency_after.gradle
@@ -20,6 +20,6 @@ android {
 }
 
 dependencies {
-    freeCompile 'com.google.guava:guava:17.0.0'
+    freeCompile 'com.google.guava:guava:18.0.0'
     compile 'com.android.support:appcompat-v7:13.0.0'
 }
\ No newline at end of file