diff options
| author | John Reck <jreck@google.com> | 2014-03-06 22:06:20 +0000 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2014-03-06 14:12:35 -0800 |
| commit | b14dfe20ef300c47cc5cdfbd844c21f7fd302f0c (patch) | |
| tree | 894d9b7652c64bd77185c064433d0271b2f4569b /core/java/android/widget/TextView.java | |
| parent | acbc41d656be91854d9c128aee06b5ecc9f54528 (diff) | |
Revert "Revert "Workaround apps not calling super.onDetachedFromWindow()""
This reverts commit bac16fae7e6fceb1e516252ede673844b772e7c3.
Change-Id: I61e997b23fac1aa984129fdc0328426ff8891bdd
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index e5cb16fa65e3..687036ca14ef 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4729,10 +4729,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (mEditor != null) mEditor.onAttachedToWindow(); } + /** @hide */ @Override - protected void onDetachedFromWindow() { - super.onDetachedFromWindow(); - + protected void onDetachedFromWindowInternal() { if (mPreDrawRegistered) { getViewTreeObserver().removeOnPreDrawListener(this); mPreDrawRegistered = false; @@ -4741,6 +4740,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener resetResolvedDrawables(); if (mEditor != null) mEditor.onDetachedFromWindow(); + + super.onDetachedFromWindowInternal(); } @Override |