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

Commit a7691a47 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Trace list view items management"

parents 6b0693a3 5fade8c6

core/java/android/widget/AbsListView.java

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.Debug; 
import android.os.Parcel;

import android.os.Parcelable;

import android.os.StrictMode;

import android.os.Trace;

import android.text.Editable;

import android.text.InputType;

import android.text.TextUtils;
@@ -2151,6 +2152,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
     * @return A view displaying the data associated with the specified position

     */

    View obtainView(int position, boolean[] isScrap) {

        Trace.traceBegin(Trace.TRACE_TAG_VIEW, "obtainView");



        isScrap[0] = false;

        View scrapView;
@@ -2213,6 +2216,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
            }

        }



        Trace.traceEnd(Trace.TRACE_TAG_VIEW);



        return child;

    }

core/java/android/widget/GridView.java

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.res.TypedArray;

import android.graphics.Rect;

import android.os.Trace;

import android.util.AttributeSet;

import android.view.Gravity;

import android.view.KeyEvent;
@@ -1364,6 +1365,8 @@ public class GridView extends AbsListView { 
     */

    private void setupChild(View child, int position, int y, boolean flow, int childrenLeft,

            boolean selected, boolean recycled, int where) {

        Trace.traceBegin(Trace.TRACE_TAG_VIEW, "setupGridItem");



        boolean isSelected = selected && shouldShowSelector();

        final boolean updateChildSelected = isSelected != child.isSelected();

        final int mode = mTouchMode;
@@ -1459,6 +1462,8 @@ public class GridView extends AbsListView { 
                != position) {

            child.jumpDrawablesToCurrentState();

        }



        Trace.traceEnd(Trace.TRACE_TAG_VIEW);

    }



    /**

core/java/android/widget/ListView.java

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.widget;



import android.os.Trace;

import com.android.internal.R;

import com.android.internal.util.Predicate;

import com.google.android.collect.Lists;
@@ -1876,6 +1877,8 @@ public class ListView extends AbsListView { 
     */

    private void setupChild(View child, int position, int y, boolean flowDown, int childrenLeft,

            boolean selected, boolean recycled) {

        Trace.traceBegin(Trace.TRACE_TAG_VIEW, "setupListItem");



        final boolean isSelected = selected && shouldShowSelector();

        final boolean updateChildSelected = isSelected != child.isSelected();

        final int mode = mTouchMode;
@@ -1956,6 +1959,8 @@ public class ListView extends AbsListView { 
                != position) {

            child.jumpDrawablesToCurrentState();

        }



        Trace.traceEnd(Trace.TRACE_TAG_VIEW);

    }



    @Override