Merge "Fix access modifiers on ImageView overrides" into ics-mr1

2011-11-10 14:16:45 -08:00
parent 0f70e482c8 6a939ae6fd
commit 71282a476a
1 changed files with 2 additions and 2 deletions
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -1045,7 +1045,7 @@ public class ImageView extends View {
    }

    @Override
-    public void onAttachedToWindow() {
+    protected void onAttachedToWindow() {
        super.onAttachedToWindow();
        if (mDrawable != null) {
            mDrawable.setVisible(getVisibility() == VISIBLE, false);
@@ -1053,7 +1053,7 @@ public class ImageView extends View {
    }

    @Override
-    public void onDetachedFromWindow() {
+    protected void onDetachedFromWindow() {
        super.onDetachedFromWindow();
        if (mDrawable != null) {
            mDrawable.setVisible(false, false);