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

Commit a848a7b8 authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix IllegalStateException in Dialer"" into lmp-dev

parents 99b5ff83 586e476a

src/com/android/dialer/list/PhoneFavoriteListView.java

+0 −7
Original line number Diff line number Diff line
@@ -317,11 +317,4 @@ public class PhoneFavoriteListView extends GridView implements OnDragDropListene 


        return (PhoneFavoriteSquareTileView) child;

    }



    // Temporary workaround for b/16862804

    @Override

    public void onWindowFocusChanged(boolean hasWindowFocus) {

        setAddStatesFromChildren(false);

        super.onWindowFocusChanged(hasWindowFocus);

    }

}

src/com/android/dialer/list/PhoneFavoritesTileAdapter.java

+0 −16
Original line number Diff line number Diff line
@@ -35,9 +35,7 @@ import android.provider.ContactsContract.PinnedPositions; 
import android.text.TextUtils;

import android.util.Log;

import android.util.LongSparseArray;

import android.view.MotionEvent;

import android.view.View;

import android.view.View.OnTouchListener;

import android.view.ViewGroup;

import android.widget.BaseAdapter;

import android.widget.FrameLayout;
@@ -131,18 +129,6 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements 
        }

    };



    // Temporary workaround for b/16862804

    final OnTouchListener mOnTouchListener = new OnTouchListener() {

        @Override

        public boolean onTouch(View v, MotionEvent event) {

            if (v.getParent() != null) {

                ViewGroup parent = (ViewGroup) v.getParent();

                parent.setAddStatesFromChildren(false);

            }

            return false;

        }

    };



    public interface OnDataSetChangedForAnimationListener {

        public void onDataSetChangedForAnimation(long... idsInPlace);

        public void cacheOffsetsForDatasetChange();
@@ -413,8 +399,6 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements 
        tileView.setPhotoManager(mPhotoManager);

        tileView.setListener(mListener);

        tileView.loadFromContact(getItem(position));



        tileView.setOnTouchListener(mOnTouchListener);

        return tileView;

    }