Merge "Fix crash when removing draw listener"

This commit is contained in:
Jorim Jaggi
2015-04-08 18:11:42 +00:00
committed by Android (Google) Code Review

View File

@@ -381,12 +381,13 @@ public class ActionMenuPresenter extends BaseMenuPresenter
computeMenuItemAnimationInfo(true);
final ViewTreeObserver observer = menuViewParent.getViewTreeObserver();
if (observer != null) {
observer.addOnDrawListener(new ViewTreeObserver.OnDrawListener() {
observer.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
@Override
public void onDraw() {
public boolean onPreDraw() {
computeMenuItemAnimationInfo(false);
observer.removeOnDrawListener(this);
observer.removeOnPreDrawListener(this);
runItemAnimations();
return true;
}
});
}