From d4a22d4edbdae50f4676af0d21c477fce6f34c44 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Thu, 16 Apr 2015 15:44:10 -0700
Subject: [PATCH] Clear ViewGroup nested scrolling axes when nested scrolling
 stops

Bug 19517415

Change-Id: I3dc1c70d8894bd4478d7671c9dac2c9b17a45efa
---
 core/java/android/view/ViewGroup.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 98b895d893cc..10724b0919ef 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;
     }
 
     /**
-- 
2.11.0