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

Merge "Reset protection path on rotation" into qt-qpr1-dev am: cf0544b022 am: 789ae763d6 am: 5c7efc0414 am: 45c514ff33

Browse Source 
Change-Id: Ie17dcd7d36973d5a54b75b674c11a81ecef45200
This commit is contained in:
Automerger Merge Worker
2020-03-07 00:26:42 +00:00
parent 949852bf3b 45c514ff33
commit 77930fd4db
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/CameraAvailabilityListener.kt
View File

@@ -26,7 +26,7 @@ import java.util.concurrent.Executor
import kotlin.math.roundToInt
const val TAG = "CameraOpTransitionController"
const val TAG = "CameraAvailabilityListener"
/**
* Listens for usage of the Camera and controls the ScreenDecorations transition to show extra

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

@@ -724,9 +724,10 @@ public class ScreenDecorations extends SystemUI implements Tunable {
private final List<Rect> mBounds = new ArrayList();
private final Rect mBoundingRect = new Rect();
private final Path mBoundingPath = new Path();
// Don't initialize these because they are cached elsewhere and may not exist
// Don't initialize these yet because they may never exist
private Rect mProtectionRect;
private Path mProtectionPath;
private Path mProtectionPathOrig;
private Rect mTotalBounds = new Rect();
// Whether or not to show the cutout protection path
private boolean mShowProtection = false;
@@ -812,7 +813,11 @@ public class ScreenDecorations extends SystemUI implements Tunable {
}
void setProtection(Path protectionPath, Rect pathBounds) {
mProtectionPath = protectionPath;
if (mProtectionPathOrig == null) {
mProtectionPathOrig = new Path();
mProtectionPath = new Path();
}
mProtectionPathOrig.set(protectionPath);
mProtectionRect = pathBounds;
}
@@ -889,7 +894,9 @@ public class ScreenDecorations extends SystemUI implements Tunable {
Matrix m = new Matrix();
transformPhysicalToLogicalCoordinates(mInfo.rotation, dw, dh, m);
mBoundingPath.transform(m);
if (mProtectionPath != null) {
if (mProtectionPathOrig != null) {
// Reset the protection path so we don't aggregate rotations
mProtectionPath.set(mProtectionPathOrig);
mProtectionPath.transform(m);
}
}