am 7555372f: am 85e5ed63: Merge "Account for translationY when targeting the fast scroller via touch" into klp-dev

* commit '7555372f019b06f8849e3e56e6921e505592fe23':
  Account for translationY when targeting the fast scroller via touch
This commit is contained in:
Adam Powell
2013-10-13 14:33:04 -07:00
committed by Android Git Automerger

View File

@@ -42,7 +42,6 @@ import android.view.ViewConfiguration;
import android.view.ViewGroup.LayoutParams;
import android.view.ViewGroupOverlay;
import android.widget.AbsListView.OnScrollListener;
import com.android.internal.R;
/**
@@ -1381,7 +1380,10 @@ class FastScroller {
}
private boolean isPointInsideY(float y) {
return y >= mThumbImage.getTop() && y <= mThumbImage.getBottom();
final float offset = mThumbImage.getTranslationY();
final float top = mThumbImage.getTop() + offset;
final float bottom = mThumbImage.getBottom() + offset;
return y >= top && y <= bottom;
}
/**