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

Browse Source 
am: 1ceef7c0fa

* commit '1ceef7c0fab15af522f56ade3e08abf559622181':
  QS: Followup to scroll fixes

Change-Id: I0d013329236b9c2ac1a6aa76fba20bcd7e79a4a1
This commit is contained in:
Jason Monk
2016-06-01 17:27:21 +00:00
committed by android-build-merger
parent 0c4f066f0b 1ceef7c0fa
commit 947ef9a717
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;