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

Commit bbe14a17 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 24473 into eclair 

* changes:
  fix [2074427] SurfaceView doesn't disappear on GONE
parents 0d134509 6b7f1a62

core/java/android/view/SurfaceView.java

+13 −1
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ public class SurfaceView extends View { 
    };

    

    boolean mRequestedVisible = false;

    boolean mWindowVisibility = false;

    boolean mViewVisibility = false;

    int mRequestedWidth = -1;

    int mRequestedHeight = -1;

    int mRequestedFormat = PixelFormat.OPAQUE;
@@ -176,12 +178,22 @@ public class SurfaceView extends View { 
        mSession = getWindowSession();

        mLayout.token = getWindowToken();

        mLayout.setTitle("SurfaceView");

        mViewVisibility = getVisibility() == VISIBLE;

    }



    @Override

    protected void onWindowVisibilityChanged(int visibility) {

        super.onWindowVisibilityChanged(visibility);

        mRequestedVisible = visibility == VISIBLE;

        mWindowVisibility = visibility == VISIBLE;

        mRequestedVisible = mWindowVisibility && mViewVisibility;

        updateWindow(false);

    }



    @Override

    public void setVisibility(int visibility) {

        super.setVisibility(visibility);

        mViewVisibility = visibility == VISIBLE;

        mRequestedVisible = mWindowVisibility && mViewVisibility;

        updateWindow(false);

    }