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

Commit 41f089e0 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 7ed1d661: Merge "fix SurfaceView visibility state changes" into jb-dev 

* commit '7ed1d661':
  fix SurfaceView visibility state changes
parents e10d88a7 7ed1d661

core/java/android/view/SurfaceView.java

+11 −1
Original line number Original line Diff line number Diff line
@@ -230,7 +230,17 @@ public class SurfaceView extends View { 
    public void setVisibility(int visibility) {

    public void setVisibility(int visibility) {

        super.setVisibility(visibility);

        super.setVisibility(visibility);

        mViewVisibility = visibility == VISIBLE;

        mViewVisibility = visibility == VISIBLE;

        mRequestedVisible = mWindowVisibility && mViewVisibility;

        boolean newRequestedVisible = mWindowVisibility && mViewVisibility;

        if (newRequestedVisible != mRequestedVisible) {

            // our base class (View) invalidates the layout only when

            // we go from/to the GONE state. However, SurfaceView needs

            // to request a re-layout when the visibility changes at all.

            // This is needed because the transparent region is computed

            // as part of the layout phase, and it changes (obviously) when

            // the visibility changes.

            requestLayout();

        }

        mRequestedVisible = newRequestedVisible;

        updateWindow(false, false);

        updateWindow(false, false);

    }

    }