diff options
| author | Griff Hazen <griff@google.com> | 2015-02-25 19:39:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-25 19:39:56 +0000 |
| commit | aeffc9cebd4e97889f5b2f61de38c60b83535ffa (patch) | |
| tree | 64f3cdb6ca779b2641e922f1bf47c1321cdec768 /services | |
| parent | 01dd0e86546a5bf815dd9a6e7cd4b7bf8e8f5719 (diff) | |
| parent | 1ad0fe6c3670f185bddeb0b4d17aba237765ea6b (diff) | |
| download | frameworks_base-aeffc9cebd4e97889f5b2f61de38c60b83535ffa.zip frameworks_base-aeffc9cebd4e97889f5b2f61de38c60b83535ffa.tar.gz frameworks_base-aeffc9cebd4e97889f5b2f61de38c60b83535ffa.tar.bz2 | |
Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/wm/EmulatorDisplayOverlay.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/EmulatorDisplayOverlay.java b/services/core/java/com/android/server/wm/EmulatorDisplayOverlay.java index 62f2b48..5e4bd8b 100644 --- a/services/core/java/com/android/server/wm/EmulatorDisplayOverlay.java +++ b/services/core/java/com/android/server/wm/EmulatorDisplayOverlay.java @@ -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); } |