summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2016-10-26 21:20:20 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-10-26 21:20:22 +0000
commit7aa48283b0cffd3125c3699f5f15b915e18fc8fe (patch)
tree8c945617631c2cafe9bb4eae895902d85d7cbe27
parent5ac13dcb251d887d87a4e5dd74dba91b0dd06834 (diff)
parent63d2e41d1b25cbbde242d315d7cfc2cbc1678957 (diff)
Merge "Properly set the center of the circular mask." into cw-f-dev
-rw-r--r--services/core/java/com/android/server/wm/CircularDisplayMask.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/CircularDisplayMask.java b/services/core/java/com/android/server/wm/CircularDisplayMask.java
index 0a9b33404b37..c57dfb676a7e 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 @@ class CircularDisplayMask {
}
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];