Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "QS: Followup to scroll fixes" into nyc-dev am: 1ceef7c0fa am: 947ef9a717

Browse Source 
am: 1487a07ad4

* commit '1487a07ad4f0bbd1e08c63089f7337eb1e0892b4':
  QS: Followup to scroll fixes

Change-Id: I7612dcd819e5a3c250d5f10b4af85cfce860fbef
This commit is contained in:
Jason Monk
2016-06-01 23:39:53 +00:00
committed by android-build-merger
parent 45d8e368ee 1487a07ad4
commit 9882301826
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/qs/NonInterceptingScrollView.java
View File

@@ -24,8 +24,6 @@ import android.widget.ScrollView;
*/
public class NonInterceptingScrollView extends ScrollView {
private float mInitialY;
public NonInterceptingScrollView(Context context, AttributeSet attrs) {
super(context, attrs);
}
@@ -35,14 +33,7 @@ public class NonInterceptingScrollView extends ScrollView {
int action = ev.getActionMasked();
switch (action) {
case MotionEvent.ACTION_DOWN:
mInitialY = ev.getY();
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
requestDisallowInterceptTouchEvent(false);
break;
default:
if (canScrollVertically(ev.getY() > mInitialY ? -1 : 1)) {
if (canScrollVertically(1)) {
requestDisallowInterceptTouchEvent(true);
}
break;