am aeffc9ce: Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev

* commit 'aeffc9cebd4e97889f5b2f61de38c60b83535ffa':
  Always draw the circular emulator overlay with square dimensions
This commit is contained in:
Griff Hazen
2015-02-25 19:47:12 +00:00
committed by Android Git Automerger

View File

@@ -93,7 +93,9 @@ class EmulatorDisplayOverlay {
}
c.drawColor(Color.TRANSPARENT, PorterDuff.Mode.SRC);
mSurfaceControl.setPosition(0, 0);
mOverlay.setBounds(0, 0, mScreenSize.x, mScreenSize.y);
// Always draw the overlay with square dimensions
int size = Math.max(mScreenSize.x, mScreenSize.y);
mOverlay.setBounds(0, 0, size, size);
mOverlay.draw(c);
mSurface.unlockCanvasAndPost(c);
}