commit | 7aa48283b0cffd3125c3699f5f15b915e18fc8fe | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Oct 26 21:20:20 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 26 21:20:22 2016 +0000 |
tree | 8c945617631c2cafe9bb4eae895902d85d7cbe27 | |
parent | 5ac13dcb251d887d87a4e5dd74dba91b0dd06834 [diff] | |
parent | 63d2e41d1b25cbbde242d315d7cfc2cbc1678957 [diff] |
Merge "Properly set the center of the circular mask." into cw-f-dev
diff --git a/services/core/java/com/android/server/wm/CircularDisplayMask.java b/services/core/java/com/android/server/wm/CircularDisplayMask.java index 0a9b334..c57dfb6 100644 --- a/services/core/java/com/android/server/wm/CircularDisplayMask.java +++ b/services/core/java/com/android/server/wm/CircularDisplayMask.java
@@ -242,7 +242,7 @@ } double cx = (maskWidth - 1.0) / 2.0; - double cy = (maskHeight - 1.0) / 2.0; + double cy = (maskHeight - 1.0 + mScreenOffset) / 2.0; double radius = maskWidth / 2.0; int[] pixels = new int[maskWidth * maskHeight];