am aa771ceb: am 71282a47: Merge "Fix access modifiers on ImageView overrides" into ics-mr1

* commit 'aa771ceb0919f2a66ba9c927e5617d15471d70e2':
  Fix access modifiers on ImageView overrides
This commit is contained in:
Adam Powell
2011-11-10 22:20:48 +00:00
committed by Android Git Automerger

View File

@@ -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);