summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2014-03-06 20:42:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-06 20:42:52 +0000
commitd621e77c8dfc99d0c347ff4cef765e9809f51333 (patch)
tree7fa5aba61dbebf905f4597159768bf45904c8cec /core/java/android/widget/TextView.java
parent16340670aff0ec980fff4354d785a38b11c33d3b (diff)
parent198d20842a537f3df3584ea084e74220e172b086 (diff)
downloadframeworks_base-d621e77c8dfc99d0c347ff4cef765e9809f51333.zip
frameworks_base-d621e77c8dfc99d0c347ff4cef765e9809f51333.tar.gz
frameworks_base-d621e77c8dfc99d0c347ff4cef765e9809f51333.tar.bz2
Merge "Workaround apps not calling super.onDetachedFromWindow()"
Diffstat (limited to 'core/java/android/widget/TextView.java')
-rw-r--r--core/java/android/widget/TextView.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index e5cb16f..779b232 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -4730,9 +4730,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
@Override
- protected void onDetachedFromWindow() {
- super.onDetachedFromWindow();
-
+ protected void onDetachedFromWindowInternal() {
if (mPreDrawRegistered) {
getViewTreeObserver().removeOnPreDrawListener(this);
mPreDrawRegistered = false;
@@ -4741,6 +4739,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
resetResolvedDrawables();
if (mEditor != null) mEditor.onDetachedFromWindow();
+
+ super.onDetachedFromWindowInternal();
}
@Override