Merge "Debug logging improvement." into jb-mr2-dev

This commit is contained in:
Craig Mautner
2013-04-10 23:54:28 +00:00
committed by Android (Google) Code Review

View File

@@ -505,20 +505,20 @@ class WindowStateAnimator {
public void setAlpha(float alpha) { public void setAlpha(float alpha) {
super.setAlpha(alpha); super.setAlpha(alpha);
if (alpha != mSurfaceTraceAlpha) { if (alpha != mSurfaceTraceAlpha) {
mSurfaceTraceAlpha = alpha;
Slog.v(SURFACE_TAG, "setAlpha: " + this + ". Called by " Slog.v(SURFACE_TAG, "setAlpha: " + this + ". Called by "
+ Debug.getCallers(3)); + Debug.getCallers(3));
} }
mSurfaceTraceAlpha = alpha;
} }
@Override @Override
public void setLayer(int zorder) { public void setLayer(int zorder) {
super.setLayer(zorder); super.setLayer(zorder);
if (zorder != mLayer) { if (zorder != mLayer) {
mLayer = zorder;
Slog.v(SURFACE_TAG, "setLayer: " + this + ". Called by " Slog.v(SURFACE_TAG, "setLayer: " + this + ". Called by "
+ Debug.getCallers(3)); + Debug.getCallers(3));
} }
mLayer = zorder;
sSurfaces.remove(this); sSurfaces.remove(this);
int i; int i;
@@ -535,20 +535,20 @@ class WindowStateAnimator {
public void setPosition(float x, float y) { public void setPosition(float x, float y) {
super.setPosition(x, y); super.setPosition(x, y);
if (x != mPosition.x || y != mPosition.y) { if (x != mPosition.x || y != mPosition.y) {
mPosition.set(x, y);
Slog.v(SURFACE_TAG, "setPosition: " + this + ". Called by " Slog.v(SURFACE_TAG, "setPosition: " + this + ". Called by "
+ Debug.getCallers(3)); + Debug.getCallers(3));
} }
mPosition.set(x, y);
} }
@Override @Override
public void setSize(int w, int h) { public void setSize(int w, int h) {
super.setSize(w, h); super.setSize(w, h);
if (w != mSize.x || h != mSize.y) { if (w != mSize.x || h != mSize.y) {
mSize.set(w, h);
Slog.v(SURFACE_TAG, "setSize: " + this + ". Called by " Slog.v(SURFACE_TAG, "setSize: " + this + ". Called by "
+ Debug.getCallers(3)); + Debug.getCallers(3));
} }
mSize.set(w, h);
} }
@Override @Override
@@ -556,10 +556,10 @@ class WindowStateAnimator {
super.setWindowCrop(crop); super.setWindowCrop(crop);
if (crop != null) { if (crop != null) {
if (!crop.equals(mWindowCrop)) { if (!crop.equals(mWindowCrop)) {
mWindowCrop.set(crop);
Slog.v(SURFACE_TAG, "setWindowCrop: " + this + ". Called by " Slog.v(SURFACE_TAG, "setWindowCrop: " + this + ". Called by "
+ Debug.getCallers(3)); + Debug.getCallers(3));
} }
mWindowCrop.set(crop);
} }
} }
@@ -567,28 +567,28 @@ class WindowStateAnimator {
public void setLayerStack(int layerStack) { public void setLayerStack(int layerStack) {
super.setLayerStack(layerStack); super.setLayerStack(layerStack);
if (layerStack != mLayerStack) { if (layerStack != mLayerStack) {
mLayerStack = layerStack;
Slog.v(SURFACE_TAG, "setLayerStack: " + this + ". Called by " + Debug.getCallers(3)); Slog.v(SURFACE_TAG, "setLayerStack: " + this + ". Called by " + Debug.getCallers(3));
} }
mLayerStack = layerStack;
} }
@Override @Override
public void hide() { public void hide() {
super.hide(); super.hide();
if (mShown) { if (mShown) {
mShown = false;
Slog.v(SURFACE_TAG, "hide: " + this + ". Called by " Slog.v(SURFACE_TAG, "hide: " + this + ". Called by "
+ Debug.getCallers(3)); + Debug.getCallers(3));
} }
mShown = false;
} }
@Override @Override
public void show() { public void show() {
super.show(); super.show();
if (!mShown) { if (!mShown) {
mShown = true;
Slog.v(SURFACE_TAG, "show: " + this + ". Called by " Slog.v(SURFACE_TAG, "show: " + this + ". Called by "
+ Debug.getCallers(3)); + Debug.getCallers(3));
} }
mShown = true;
} }
@Override @Override