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

Merge "Skip redrawing the bars if the surface aspect ratio matches" into qt-dev

Browse Source
This commit is contained in:
Winson Chung
2019-06-25 04:10:14 +00:00
committed by Android (Google) Code Review
parent e8d09721a1 357deda0ef
commit 3cf66a40e3
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
services/core/java/com/android/server/wm/TaskSnapshotSurface.java
View File

@@ -317,6 +317,11 @@ class TaskSnapshotSurface implements StartingSurface {
throw new IllegalStateException("mSurface does not hold a valid surface."); throw new IllegalStateException("mSurface does not hold a valid surface.");
} }
final SurfaceSession session = new SurfaceSession(); final SurfaceSession session = new SurfaceSession();
// We consider nearly matched dimensions as there can be rounding errors and the user won't
// notice very minute differences from scaling one dimension more than the other
final boolean aspectRatioMismatch = Math.abs(
((float) buffer.getWidth() / buffer.getHeight())
- ((float) mFrame.width() / mFrame.height())) > 0.01f;
// Keep a reference to it such that it doesn't get destroyed when finalized. // Keep a reference to it such that it doesn't get destroyed when finalized.
mChildSurfaceControl = new SurfaceControl.Builder(session) mChildSurfaceControl = new SurfaceControl.Builder(session)
@@ -328,16 +333,21 @@ class TaskSnapshotSurface implements StartingSurface {
Surface surface = new Surface(); Surface surface = new Surface();
surface.copyFrom(mChildSurfaceControl); surface.copyFrom(mChildSurfaceControl);
// Clip off ugly navigation bar. final Rect frame;
final Rect crop = calculateSnapshotCrop();
final Rect frame = calculateSnapshotFrame(crop);
SurfaceControl.openTransaction(); SurfaceControl.openTransaction();
try { try {
// We can just show the surface here as it will still be hidden as the parent is // We can just show the surface here as it will still be hidden as the parent is
// still hidden. // still hidden.
mChildSurfaceControl.show(); mChildSurfaceControl.show();
mChildSurfaceControl.setWindowCrop(crop); if (aspectRatioMismatch) {
mChildSurfaceControl.setPosition(frame.left, frame.top); // Clip off ugly navigation bar.
final Rect crop = calculateSnapshotCrop();
frame = calculateSnapshotFrame(crop);
mChildSurfaceControl.setWindowCrop(crop);
mChildSurfaceControl.setPosition(frame.left, frame.top);
} else {
frame = null;
}
// Scale the mismatch dimensions to fill the task bounds // Scale the mismatch dimensions to fill the task bounds
final float scale = 1 / mSnapshot.getScale(); final float scale = 1 / mSnapshot.getScale();
@@ -348,10 +358,12 @@ class TaskSnapshotSurface implements StartingSurface {
surface.attachAndQueueBuffer(buffer); surface.attachAndQueueBuffer(buffer);
surface.release(); surface.release();
final Canvas c = mSurface.lockCanvas(null); if (aspectRatioMismatch) {
drawBackgroundAndBars(c, frame); final Canvas c = mSurface.lockCanvas(null);
mSurface.unlockCanvasAndPost(c); drawBackgroundAndBars(c, frame);
mSurface.release(); mSurface.unlockCanvasAndPost(c);
mSurface.release();
}
} }
/** /**