commit 59c82376e573d35f1bad7a35ccd3fe6df85f4342
author The Android Open Source Project <initial-contribution@android.com> Wed Jun 02 08:54:59 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 02 08:54:59 2010 -0700
tree 0e9d4163246879007bbd21b4aecab03dd8023800
parent 501b2b400a15a43849ff84c5da4e68d23ed726cf
parent c8763858cfcae8be89c0f88df87bf9a3ad90ae64

am c8763858: merge from open-source master

Merge commit 'c8763858cfcae8be89c0f88df87bf9a3ad90ae64' into kraken

* commit 'c8763858cfcae8be89c0f88df87bf9a3ad90ae64':
  Fix for issue 895 (missing android: prefix), Removed unused imports

core/java/android/app/ListActivity.java

diff --git a/core/java/android/app/ListActivity.java b/core/java/android/app/ListActivity.java
index 84a57b5..4bf5518 100644
--- a/core/java/android/app/ListActivity.java
+++ b/core/java/android/app/ListActivity.java
@@ -18,9 +18,7 @@
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.view.KeyEvent;
 import android.view.View;
-import android.widget.Adapter;
 import android.widget.AdapterView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
@@ -68,7 +66,7 @@
  *               android:layout_weight="1"
  *               android:drawSelectorOnTop="false"/>
  *
- *     <TextView id="@id/android:empty"
+ *     <TextView android:id="@id/android:empty"
  *               android:layout_width="match_parent"
  *               android:layout_height="match_parent"
  *               android:background="#FF0000"
@@ -316,7 +314,7 @@
     }
 
     private AdapterView.OnItemClickListener mOnClickListener = new AdapterView.OnItemClickListener() {
-        public void onItemClick(AdapterView parent, View v, int position, long id)
+        public void onItemClick(AdapterView<?> parent, View v, int position, long id)
         {
             onListItemClick((ListView)parent, v, position, id);
         }