summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-09-27 15:16:49 -0700
committerYorke Lee <yorkelee@google.com>2013-09-27 15:16:49 -0700
commit3ed80a357d780310777178ad589d7771d4f7bf2d (patch)
treefe46408871a6824f5fa0de10e32ae00ff066d8a6
parent50c92e029f55d07f48fc23355109b5da8fe3a7eb (diff)
Fix relayout requests when dragging
Also removed unneeded legacy code that shows the keyboard when the search view is focused. The framework does that automatically for us, and this code was causing problems by popping up the keyboard whenever you dragged a contact over the search view. Also turned off debug flag. Bug: 10965693 Change-Id: I2fb9cedecd2a78faa367f750f8a0aea9de68a359
-rw-r--r--src/com/android/dialer/DialtactsActivity.java8
-rw-r--r--src/com/android/dialer/list/PhoneFavoriteFragment.java2
-rw-r--r--src/com/android/dialer/list/PhoneFavoriteListView.java3
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 4e0b8ff0e..39bc8aeac 100644
--- a/src/com/android/dialer/list/PhoneFavoriteListView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteListView.java
@@ -386,7 +386,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;