Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev

am: e94b3ba099

* commit 'e94b3ba0994d52eccc7f0ed797ee1b3541f3ae83':
  Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on.
This commit is contained in:
Ching Tzung Lin
2015-10-23 18:13:01 +00:00
committed by android-build-merger

View File

@@ -56,7 +56,7 @@ class CircularDisplayMask {
int screenOffset, int maskThickness) {
mScreenSize = new Point();
display.getSize(mScreenSize);
if (mScreenSize.x != mScreenSize.y) {
if (mScreenSize.x != mScreenSize.y + screenOffset) {
Slog.w(TAG, "Screen dimensions of displayId = " + display.getDisplayId() +
"are not equal, circularMask will not be drawn.");
mDimensionsUnequal = true;