Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-12 14:35:33 +00:00
committed by Android (Google) Code Review
parent f6840a17ff c41b32baac
commit 819fffaf1d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
View File

@@ -214,7 +214,11 @@ public class ScreenDecorations extends SystemUI implements Tunable {
} }
private boolean shouldDrawCutout() { 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); com.android.internal.R.bool.config_fillMainBuiltInDisplayCutout);
} }
@@ -393,7 +397,7 @@ public class ScreenDecorations extends SystemUI implements Tunable {
mBoundingRect.setEmpty(); mBoundingRect.setEmpty();
mBoundingPath.reset(); mBoundingPath.reset();
int newVisible; int newVisible;
if (hasCutout()) { if (shouldDrawCutout(getContext()) && hasCutout()) {
mBounds.set(mInfo.displayCutout.getBounds()); mBounds.set(mInfo.displayCutout.getBounds());
localBounds(mBoundingRect); localBounds(mBoundingRect);
updateBoundingPath(); updateBoundingPath();