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

Merge "Fix split divider position issue" into sc-dev

Browse Source
This commit is contained in:
Wale Ogunwale
2021-02-10 14:40:56 +00:00
committed by Android (Google) Code Review
parent 4b8044cb63 636f9e3aa4
commit fd5b5eaea5
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitWindowManager.java
View File

@@ -39,6 +39,7 @@ import android.view.IWindow;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.SurfaceControl; import android.view.SurfaceControl;
import android.view.SurfaceControlViewHost; import android.view.SurfaceControlViewHost;
import android.view.SurfaceSession;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.WindowlessWindowManager; import android.view.WindowlessWindowManager;
@@ -55,6 +56,7 @@ public final class SplitWindowManager extends WindowlessWindowManager {
private final ParentContainerCallbacks mParentContainerCallbacks; private final ParentContainerCallbacks mParentContainerCallbacks;
private Context mContext; private Context mContext;
private SurfaceControlViewHost mViewHost; private SurfaceControlViewHost mViewHost;
private SurfaceControl mLeash;
private boolean mResizingSplits; private boolean mResizingSplits;
private final String mWindowName; private final String mWindowName;
@@ -88,7 +90,15 @@ public final class SplitWindowManager extends WindowlessWindowManager {
@Override @Override
protected void attachToParentSurface(IWindow window, SurfaceControl.Builder b) { protected void attachToParentSurface(IWindow window, SurfaceControl.Builder b) {
mParentContainerCallbacks.attachToParentSurface(b); // Can't set position for the ViewRootImpl SC directly. Create a leash to manipulate later.
final SurfaceControl.Builder builder = new SurfaceControl.Builder(new SurfaceSession())
.setContainerLayer()
.setName(TAG)
.setHidden(false)
.setCallsite("SplitWindowManager#attachToParentSurface");
mParentContainerCallbacks.attachToParentSurface(builder);
mLeash = builder.build();
b.setParent(mLeash);
} }
/** Inflates {@link DividerView} on to the root surface. */ /** Inflates {@link DividerView} on to the root surface. */
@@ -118,9 +128,15 @@ public final class SplitWindowManager extends WindowlessWindowManager {
* hierarchy. * hierarchy.
*/ */
void release() { void release() {
if (mViewHost == null) return; if (mViewHost != null){
mViewHost.release(); mViewHost.release();
mViewHost = null; mViewHost = null;
}
if (mLeash != null) {
new SurfaceControl.Transaction().remove(mLeash).apply();
mLeash = null;
}
} }
void setResizingSplits(boolean resizing) { void setResizingSplits(boolean resizing) {
@@ -139,6 +155,6 @@ public final class SplitWindowManager extends WindowlessWindowManager {
*/ */
@Nullable @Nullable
SurfaceControl getSurfaceControl() { SurfaceControl getSurfaceControl() {
return mViewHost == null ? null : getSurfaceControl(mViewHost.getWindowToken()); return mLeash;
} }
} }

2
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
View File

@@ -156,7 +156,7 @@ class StageCoordinator implements SplitLayout.LayoutChangeListener,
} }
void setSideStageVisibility(boolean visible) { void setSideStageVisibility(boolean visible) {
if (!mSideStageListener.mVisible == visible) return; if (mSideStageListener.mVisible == visible) return;
final WindowContainerTransaction wct = new WindowContainerTransaction(); final WindowContainerTransaction wct = new WindowContainerTransaction();
mSideStage.setVisibility(visible, wct); mSideStage.setVisibility(visible, wct);