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

Merge "WindowlessWindowManager: Set size when creating surface" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-26 20:41:22 +00:00
committed by Android (Google) Code Review
parent 40d3143c8a 5d9d2ddca2
commit 58c7846f6a
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/view/WindowlessWindowManager.java
View File

@@ -136,6 +136,7 @@ public class WindowlessWindowManager implements IWindowSession {
final SurfaceControl.Builder b = new SurfaceControl.Builder(mSurfaceSession)
.setParent(mRootSurface)
.setFormat(attrs.format)
.setBufferSize(getSurfaceWidth(attrs), getSurfaceHeight(attrs))
.setName(attrs.getTitle().toString());
final SurfaceControl sc = b.build();
@@ -242,13 +243,8 @@ public class WindowlessWindowManager implements IWindowSession {
WindowManager.LayoutParams attrs = state.mParams;
if (viewFlags == View.VISIBLE) {
final Rect surfaceInsets = attrs.surfaceInsets;
int width = surfaceInsets != null
? attrs.width + surfaceInsets.left + surfaceInsets.right : attrs.width;
int height = surfaceInsets != null
? attrs.height + surfaceInsets.top + surfaceInsets.bottom : attrs.height;
t.setBufferSize(sc, width, height).setOpaque(sc, isOpaque(attrs)).show(sc).apply();
t.setBufferSize(sc, getSurfaceWidth(attrs), getSurfaceHeight(attrs))
.setOpaque(sc, isOpaque(attrs)).show(sc).apply();
outSurfaceControl.copyFrom(sc);
} else {
t.hide(sc).apply();
@@ -444,4 +440,15 @@ public class WindowlessWindowManager implements IWindowSession {
public android.os.IBinder asBinder() {
return null;
}
private int getSurfaceWidth(WindowManager.LayoutParams attrs) {
final Rect surfaceInsets = attrs.surfaceInsets;
return surfaceInsets != null
? attrs.width + surfaceInsets.left + surfaceInsets.right : attrs.width;
}
private int getSurfaceHeight(WindowManager.LayoutParams attrs) {
final Rect surfaceInsets = attrs.surfaceInsets;
return surfaceInsets != null
? attrs.height + surfaceInsets.top + surfaceInsets.bottom : attrs.height;
}
}

1
services/core/java/com/android/server/wm/ShellRoot.java
View File

@@ -156,4 +156,3 @@ public class ShellRoot {
}
}
}