diff options
| author | Bart Sears <bsears@google.com> | 2014-03-06 21:10:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-06 21:10:06 +0000 |
| commit | acbc41d656be91854d9c128aee06b5ecc9f54528 (patch) | |
| tree | 385565253afa0fa4de8a5dec11e4b93e239f4eec /core/java/android/widget/TextView.java | |
| parent | d621e77c8dfc99d0c347ff4cef765e9809f51333 (diff) | |
| parent | bac16fae7e6fceb1e516252ede673844b772e7c3 (diff) | |
Merge "Revert "Workaround apps not calling super.onDetachedFromWindow()""
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 779b2325fa08..e5cb16fa65e3 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4730,7 +4730,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } @Override - protected void onDetachedFromWindowInternal() { + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + if (mPreDrawRegistered) { getViewTreeObserver().removeOnPreDrawListener(this); mPreDrawRegistered = false; @@ -4739,8 +4741,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener resetResolvedDrawables(); if (mEditor != null) mEditor.onDetachedFromWindow(); - - super.onDetachedFromWindowInternal(); } @Override |