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

Merge "Fix null surface crash when switch split" into tm-qpr-dev am: a6fa69cb01

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20675387

Change-Id: I96912d2bc7c6e9619932e9f7d13fb417def90a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Huang
2022-12-13 13:57:37 +00:00
committed by Automerger Merge Worker
parent 02c9a5ad4a a6fa69cb01
commit 1cb00496f1
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerView.java
View File

@@ -403,5 +403,10 @@ public class DividerView extends FrameLayout implements View.OnTouchListener {
} }
return true; return true;
} }
@Override
public boolean onDoubleTapEvent(@NonNull MotionEvent e) {
return true;
}
} }
} }

22
libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitDecorManager.java
View File

@@ -74,7 +74,8 @@ public class SplitDecorManager extends WindowlessWindowManager {
private boolean mShown; private boolean mShown;
private boolean mIsResizing; private boolean mIsResizing;
private final Rect mBounds = new Rect(); private final Rect mOldBounds = new Rect();
private final Rect mResizingBounds = new Rect();
private final Rect mTempRect = new Rect(); private final Rect mTempRect = new Rect();
private ValueAnimator mFadeAnimator; private ValueAnimator mFadeAnimator;
@@ -158,6 +159,8 @@ public class SplitDecorManager extends WindowlessWindowManager {
mResizingIconView = null; mResizingIconView = null;
mIsResizing = false; mIsResizing = false;
mShown = false; mShown = false;
mOldBounds.setEmpty();
mResizingBounds.setEmpty();
} }
/** Showing resizing hint. */ /** Showing resizing hint. */
@@ -170,13 +173,14 @@ public class SplitDecorManager extends WindowlessWindowManager {
if (!mIsResizing) { if (!mIsResizing) {
mIsResizing = true; mIsResizing = true;
mBounds.set(newBounds); mOldBounds.set(newBounds);
} }
mResizingBounds.set(newBounds);
mOffsetX = offsetX; mOffsetX = offsetX;
mOffsetY = offsetY; mOffsetY = offsetY;
final boolean show = final boolean show =
newBounds.width() > mBounds.width() || newBounds.height() > mBounds.height(); newBounds.width() > mOldBounds.width() || newBounds.height() > mOldBounds.height();
final boolean update = show != mShown; final boolean update = show != mShown;
if (update && mFadeAnimator != null && mFadeAnimator.isRunning()) { if (update && mFadeAnimator != null && mFadeAnimator.isRunning()) {
// If we need to animate and animator still running, cancel it before we ensure both // If we need to animate and animator still running, cancel it before we ensure both
@@ -193,8 +197,8 @@ public class SplitDecorManager extends WindowlessWindowManager {
if (mGapBackgroundLeash == null && !immediately) { if (mGapBackgroundLeash == null && !immediately) {
final boolean isLandscape = newBounds.height() == sideBounds.height(); final boolean isLandscape = newBounds.height() == sideBounds.height();
final int left = isLandscape ? mBounds.width() : 0; final int left = isLandscape ? mOldBounds.width() : 0;
final int top = isLandscape ? 0 : mBounds.height(); final int top = isLandscape ? 0 : mOldBounds.height();
mGapBackgroundLeash = SurfaceUtils.makeColorLayer(mHostLeash, mGapBackgroundLeash = SurfaceUtils.makeColorLayer(mHostLeash,
GAP_BACKGROUND_SURFACE_NAME, mSurfaceSession); GAP_BACKGROUND_SURFACE_NAME, mSurfaceSession);
// Fill up another side bounds area. // Fill up another side bounds area.
@@ -272,6 +276,8 @@ public class SplitDecorManager extends WindowlessWindowManager {
mIsResizing = false; mIsResizing = false;
mOffsetX = 0; mOffsetX = 0;
mOffsetY = 0; mOffsetY = 0;
mOldBounds.setEmpty();
mResizingBounds.setEmpty();
if (mFadeAnimator != null && mFadeAnimator.isRunning()) { if (mFadeAnimator != null && mFadeAnimator.isRunning()) {
if (!mShown) { if (!mShown) {
// If fade-out animation is running, just add release callback to it. // If fade-out animation is running, just add release callback to it.
@@ -303,8 +309,8 @@ public class SplitDecorManager extends WindowlessWindowManager {
/** Screenshot host leash and attach on it if meet some conditions */ /** Screenshot host leash and attach on it if meet some conditions */
public void screenshotIfNeeded(SurfaceControl.Transaction t) { public void screenshotIfNeeded(SurfaceControl.Transaction t) {
if (!mShown && mIsResizing) { if (!mShown && mIsResizing && !mOldBounds.equals(mResizingBounds)) {
mTempRect.set(mBounds); mTempRect.set(mOldBounds);
mTempRect.offsetTo(0, 0); mTempRect.offsetTo(0, 0);
mScreenshot = ScreenshotUtils.takeScreenshot(t, mHostLeash, mTempRect, mScreenshot = ScreenshotUtils.takeScreenshot(t, mHostLeash, mTempRect,
Integer.MAX_VALUE - 1); Integer.MAX_VALUE - 1);
@@ -315,7 +321,7 @@ public class SplitDecorManager extends WindowlessWindowManager {
public void setScreenshotIfNeeded(SurfaceControl screenshot, SurfaceControl.Transaction t) { public void setScreenshotIfNeeded(SurfaceControl screenshot, SurfaceControl.Transaction t) {
if (screenshot == null || !screenshot.isValid()) return; if (screenshot == null || !screenshot.isValid()) return;
if (!mShown && mIsResizing) { if (!mShown && mIsResizing && !mOldBounds.equals(mResizingBounds)) {
mScreenshot = screenshot; mScreenshot = screenshot;
t.reparent(screenshot, mHostLeash); t.reparent(screenshot, mHostLeash);
t.setLayer(screenshot, Integer.MAX_VALUE - 1); t.setLayer(screenshot, Integer.MAX_VALUE - 1);