Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8763858 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master

Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6
parents 8799cdfb d6c19197
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -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);
        }