commit 41ddbe19ea116ce45c1cd91d8c0584a16f13ba84
author Yorke Lee <yorkelee@google.com> Mon Apr 20 16:02:46 2015 -0700
committer Yorke Lee <yorkelee@google.com> Mon Apr 20 16:03:29 2015 -0700
tree 6b5c9873513fedf2503e8a6f095cfcac33cce654
parent 577200257eb759075888eae000214f4c9f5cb035

Make sure to correctly remove onPreDrawListener

Bug: 20421404
Change-Id: Icc8b4a74ea17e969577dbaaa794b85a2e66ef8df

src/com/android/dialer/calllog/CallLogListItemViewHolder.java

diff --git a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
index 4b208f1..3652900 100644
--- a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
+++ b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
@@ -347,9 +347,11 @@
             observer.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
                 @Override
                 public boolean onPreDraw() {
-                    if (observer.isAlive()) {
-                        observer.removeOnPreDrawListener(this);
+                    ViewTreeObserver vto = observer;
+                    if (!vto.isAlive()) {
+                        vto = actionsView.getViewTreeObserver();
                     }
+                    vto.removeOnPreDrawListener(this);
 
                     // TODO: Animate, instead of immediately resizing.
                     int currentHeight = primaryActionView.getHeight();