diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-06-02 08:41:59 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-06-02 08:41:59 -0700 |
| commit | c8763858cfcae8be89c0f88df87bf9a3ad90ae64 (patch) | |
| tree | 16a83745e54c77537bb6d56beacd526bce6d1c1a /core | |
| parent | 8799cdfb012935501e47f15f28d6a8ed90bd464d (diff) | |
| parent | d6c1919779acb042392615637b9007e0c4b89023 (diff) | |
| download | frameworks_base-c8763858cfcae8be89c0f88df87bf9a3ad90ae64.zip frameworks_base-c8763858cfcae8be89c0f88df87bf9a3ad90ae64.tar.gz frameworks_base-c8763858cfcae8be89c0f88df87bf9a3ad90ae64.tar.bz2 | |
merge from open-source master
Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ListActivity.java | 6 |
1 files changed, 2 insertions, 4 deletions
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 @@ package android.app; 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 @@ import android.widget.ListView; * 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 @@ public class ListActivity extends Activity { } 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); } |