Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71282a47 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

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

parents 0f70e482 6a939ae6

core/java/android/widget/ImageView.java

+2 −2
Original line number Diff line number Diff line
@@ -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);