diff options
author | Yorke Lee <yorkelee@google.com> | 2013-09-28 00:07:39 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-28 00:07:40 +0000 |
commit | 990c95f104c01a2f3417e48ac51b58d989d0f21b (patch) | |
tree | c169f9568f55666460ed1daa0d80be814da4c091 | |
parent | 392b69c3c3a695b77af528dd17c6a7cc6e4866f8 (diff) | |
parent | 3ed80a357d780310777178ad589d7771d4f7bf2d (diff) |
Merge "Fix relayout requests when dragging" into klp-dev
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 8 | ||||
-rw-r--r-- | src/com/android/dialer/list/PhoneFavoriteFragment.java | 2 | ||||
-rw-r--r-- | src/com/android/dialer/list/PhoneFavoriteListView.java | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index a4702c637..12a0f2bd9 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -496,14 +496,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O mSearchView = (EditText) findViewById(R.id.search_view); mSearchView.addTextChangedListener(mPhoneSearchQueryTextListener); mSearchView.setHint(getString(R.string.dialer_hint_find_contact)); - mSearchView.setOnFocusChangeListener(new OnFocusChangeListener() { - @Override - public void onFocusChange(View view, boolean hasFocus) { - if (hasFocus) { - showInputMethod(view.findFocus()); - } - } - }); } final AnimatorListener mHideListener = new AnimatorListenerAdapter() { diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java index eca4d971f..d4fa7d492 100644 --- a/src/com/android/dialer/list/PhoneFavoriteFragment.java +++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java @@ -74,7 +74,7 @@ public class PhoneFavoriteFragment extends Fragment implements OnItemClickListen PhoneFavoritesTileAdapter.OnDataSetChangedForAnimationListener { private static final String TAG = PhoneFavoriteFragment.class.getSimpleName(); - private static final boolean DEBUG = true; + private static final boolean DEBUG = false; private int mAnimationDuration; diff --git a/src/com/android/dialer/list/PhoneFavoriteListView.java b/src/com/android/dialer/list/PhoneFavoriteListView.java index 9160e3a9c..10b9e9a96 100644 --- a/src/com/android/dialer/list/PhoneFavoriteListView.java +++ b/src/com/android/dialer/list/PhoneFavoriteListView.java @@ -391,7 +391,8 @@ public class PhoneFavoriteListView extends ListView implements SwipeHelperCallba // Draw the drag shadow at its last known location if the drag shadow exists. if (mDragShadowOverlay != null) { - mDragShadowOverlay.setLayoutParams(getDragShadowLayoutParams()); + mDragShadowOverlay.setX(mDragShadowLeft); + mDragShadowOverlay.setY(mDragShadowTop); } final ContactTileRow tile = (ContactTileRow) child; |