am a76a792f: am bbe14a17: Merge change 24473 into eclair

Merge commit 'a76a792f52b8dd7f955bcf781a58c540a57de5d4'

* commit 'a76a792f52b8dd7f955bcf781a58c540a57de5d4':
  fix [2074427] SurfaceView doesn't disappear on GONE
This commit is contained in:
Mathias Agopian
2009-09-09 19:34:13 -07:00
committed by Android Git Automerger

View File

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