Fix scroll listeners lost in ViewTreeObserver.

Bug: 5512156 Change-Id: I4bb7ccab39053ae75a4bef9309ab334a4ccecf51
2011-10-25 17:01:28 +01:00
parent 2536b1d627
commit 757c697f73
1 changed files with 8 additions and 0 deletions
--- a/core/java/android/view/ViewTreeObserver.java
+++ b/core/java/android/view/ViewTreeObserver.java
@@ -288,6 +288,14 @@ public final class ViewTreeObserver {
            }
        }

+        if (observer.mOnScrollChangedListeners != null) {
+            if (mOnScrollChangedListeners != null) {
+                mOnScrollChangedListeners.addAll(observer.mOnScrollChangedListeners);
+            } else {
+                mOnScrollChangedListeners = observer.mOnScrollChangedListeners;
+            }
+        }
+
        observer.kill();
    }