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

Commit 59c82376 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am c8763858: merge from open-source master 

Merge commit 'c8763858' into kraken

* commit 'c8763858':
  Fix for issue 895 (missing android: prefix), Removed unused imports
parents 501b2b40 c8763858

core/java/android/app/ListActivity.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -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);

        }

        }