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

Author: adamp

core/java/android/widget/ImageView.java

@@ -1045,15 +1045,15 @@ public void setVisibility(int visibility) {
     }
 
     @Override
-    public void onAttachedToWindow() {
+    protected void onAttachedToWindow() {
         super.onAttachedToWindow();
         if (mDrawable != null) {
             mDrawable.setVisible(getVisibility() == VISIBLE, false);
         }
     }
 
     @Override
-    public void onDetachedFromWindow() {
+    protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         if (mDrawable != null) {
             mDrawable.setVisible(false, false);