commit 7210c20b28dc3d0b1ce1409a6c7908cdea343dcf
author Yorke Lee <yorkelee@google.com> Mon Sep 30 14:17:35 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 30 14:17:35 2013 -0700
tree c169f9568f55666460ed1daa0d80be814da4c091
parent 62c7defd74e83fed84e4729664c6b20de8ed5846
parent 990c95f104c01a2f3417e48ac51b58d989d0f21b

am 990c95f1: Merge "Fix relayout requests when dragging" into klp-dev

* commit '990c95f104c01a2f3417e48ac51b58d989d0f21b':
  Fix relayout requests when dragging

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index a4702c6..12a0f2b 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -496,14 +496,6 @@
         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() {

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

diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index eca4d97..d4fa7d4 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -74,7 +74,7 @@
         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;
 

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

diff --git a/src/com/android/dialer/list/PhoneFavoriteListView.java b/src/com/android/dialer/list/PhoneFavoriteListView.java
index 9160e3a..10b9e9a 100644
--- a/src/com/android/dialer/list/PhoneFavoriteListView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteListView.java
@@ -391,7 +391,8 @@
 
         // 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;