diff options
| author | Adam Powell <adamp@google.com> | 2015-04-16 22:58:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 22:58:39 +0000 |
| commit | 54832cdb763034b5ee2d5ab289033a7ef2cf9cd1 (patch) | |
| tree | 115babb69a8568df8847dd09b3df460d9ad30020 | |
| parent | f647832bd4ca9c083aa2748f2a21bc433cb26be3 (diff) | |
| parent | d4a22d4edbdae50f4676af0d21c477fce6f34c44 (diff) | |
| download | frameworks_base-54832cdb763034b5ee2d5ab289033a7ef2cf9cd1.zip frameworks_base-54832cdb763034b5ee2d5ab289033a7ef2cf9cd1.tar.gz frameworks_base-54832cdb763034b5ee2d5ab289033a7ef2cf9cd1.tar.bz2 | |
Merge "Clear ViewGroup nested scrolling axes when nested scrolling stops"
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 1 |
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; } /** |