diff options
author | Yorke Lee <yorkelee@google.com> | 2014-08-26 16:29:37 +0000 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2014-08-26 16:29:37 +0000 |
commit | 586e476aa9efac1d39952d9aa31d00fcf054ac28 (patch) | |
tree | 1a3a7596e77472a03c24eef8015d37602331a309 | |
parent | 94762c39403e4b49aefa8f49620b4a6bc2e675b3 (diff) |
Revert "Fix IllegalStateException in Dialer"
This reverts commit 94762c39403e4b49aefa8f49620b4a6bc2e675b3.
Underlying ART bug has been fixed, so we don't need this anymore.
Bug: 16862804
Change-Id: I205390bfc4fda3b8dcdf48ef99a0d1c4144c2802
-rw-r--r-- | src/com/android/dialer/list/PhoneFavoriteListView.java | 7 | ||||
-rw-r--r-- | src/com/android/dialer/list/PhoneFavoritesTileAdapter.java | 16 |
2 files changed, 0 insertions, 23 deletions
diff --git a/src/com/android/dialer/list/PhoneFavoriteListView.java b/src/com/android/dialer/list/PhoneFavoriteListView.java index 2b4575486..4ecc1cd90 100644 --- a/src/com/android/dialer/list/PhoneFavoriteListView.java +++ b/src/com/android/dialer/list/PhoneFavoriteListView.java @@ -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); - } } diff --git a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java index 600bd8b5c..382e42e56 100644 --- a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java +++ b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java @@ -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; } |