Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 59c82376: am c8763858: merge from open-source master

Browse Source
This commit is contained in:
The Android Open Source Project
2010-06-02 08:56:19 -07:00
committed by Android Git Automerger
parent 112ad01dbb 59c82376e5
commit afca60ddfd
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/ListActivity.java
View File

@@ -18,9 +18,7 @@ package android.app;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.widget.Adapter;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ListAdapter; import android.widget.ListAdapter;
import android.widget.ListView; import android.widget.ListView;
@@ -68,7 +66,7 @@ import android.widget.ListView;
* android:layout_weight="1" * android:layout_weight="1"
* android:drawSelectorOnTop="false"/> * android:drawSelectorOnTop="false"/>
* *
* <TextView id="@id/android:empty" * <TextView android:id="@id/android:empty"
* android:layout_width="match_parent" * android:layout_width="match_parent"
* android:layout_height="match_parent" * android:layout_height="match_parent"
* android:background="#FF0000" * android:background="#FF0000"
@@ -316,7 +314,7 @@ public class ListActivity extends Activity {
} }
private AdapterView.OnItemClickListener mOnClickListener = new AdapterView.OnItemClickListener() { 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); onListItemClick((ListView)parent, v, position, id);
} }