Merge "ScreenDecorations: Only draw cutout if requested" into pi-dev

am: 819fffaf1d

Change-Id: I83f228f42789b40816c39b517c53e35ae74f2554
This commit is contained in:
Adrian Roos
2018-04-12 07:42:59 -07:00
committed by android-build-merger

View File

@@ -214,7 +214,11 @@ public class ScreenDecorations extends SystemUI implements Tunable {
}
private boolean shouldDrawCutout() {
return mContext.getResources().getBoolean(
return shouldDrawCutout(mContext);
}
static boolean shouldDrawCutout(Context context) {
return context.getResources().getBoolean(
com.android.internal.R.bool.config_fillMainBuiltInDisplayCutout);
}
@@ -393,7 +397,7 @@ public class ScreenDecorations extends SystemUI implements Tunable {
mBoundingRect.setEmpty();
mBoundingPath.reset();
int newVisible;
if (hasCutout()) {
if (shouldDrawCutout(getContext()) && hasCutout()) {
mBounds.set(mInfo.displayCutout.getBounds());
localBounds(mBoundingRect);
updateBoundingPath();