summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/ViewGroup.java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2015-04-16 15:44:10 -0700
committerAdam Powell <adamp@google.com>2015-04-16 15:44:10 -0700
commitd4a22d4edbdae50f4676af0d21c477fce6f34c44 (patch)
tree56b5f31153b733c99ab3af2be069b18e58fb6920 /core/java/android/view/ViewGroup.java
parent8148f8b6f73f69bd87fc2b424b003709ada8db01 (diff)
downloadframeworks_base-d4a22d4edbdae50f4676af0d21c477fce6f34c44.zip
frameworks_base-d4a22d4edbdae50f4676af0d21c477fce6f34c44.tar.gz
frameworks_base-d4a22d4edbdae50f4676af0d21c477fce6f34c44.tar.bz2
Clear ViewGroup nested scrolling axes when nested scrolling stops
Bug 19517415 Change-Id: I3dc1c70d8894bd4478d7671c9dac2c9b17a45efa
Diffstat (limited to 'core/java/android/view/ViewGroup.java')
-rw-r--r--core/java/android/view/ViewGroup.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 98b895d..10724b0 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -6353,6 +6353,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
public void onStopNestedScroll(View child) {
// Stop any recursive nested scrolling.
stopNestedScroll();
+ mNestedScrollAxes = 0;
}
/**