diff options
6 files changed, 4 insertions, 54 deletions
diff --git a/core/java/android/app/WindowConfiguration.java b/core/java/android/app/WindowConfiguration.java index 79f05a3caa93..eedf95882294 100644 --- a/core/java/android/app/WindowConfiguration.java +++ b/core/java/android/app/WindowConfiguration.java @@ -852,15 +852,6 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu } /** - * Returns true if this container may be scaled without resizing, and windows within may need - * to be configured as such. - * @hide - */ - public boolean windowsAreScaleable() { - return mWindowingMode == WINDOWING_MODE_PINNED; - } - - /** * Returns true if windows in this container should be given move animations by default. * @hide */ diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 249fe031b757..0077182c46de 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -1474,14 +1474,6 @@ class Task extends WindowContainer<WindowContainer> { // Update task bounds if needed. adjustBoundsForDisplayChangeIfNeeded(getDisplayContent()); - if (getWindowConfiguration().windowsAreScaleable()) { - // We force windows out of SCALING_MODE_FREEZE so that we can continue to animate them - // while a resize is pending. - forceWindowsScaleable(true /* force */); - } else { - forceWindowsScaleable(false /* force */); - } - mRootWindowContainer.updateUIDsPresentOnDisplay(); // Resume next focusable stack after reparenting to another display if we aren't removing @@ -3780,17 +3772,6 @@ class Task extends WindowContainer<WindowContainer> { positionChildAt(position, child, false /* includeParents */); } - void forceWindowsScaleable(boolean force) { - mWmService.openSurfaceTransaction(); - try { - for (int i = mChildren.size() - 1; i >= 0; i--) { - mChildren.get(i).forceWindowsScaleableInTransaction(force); - } - } finally { - mWmService.closeSurfaceTransaction("forceWindowsScaleable"); - } - } - void setTaskDescription(TaskDescription taskDescription) { mTaskDescription = taskDescription; } diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 95d86621c541..0edaa1d821df 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -861,13 +861,6 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< } } - void forceWindowsScaleableInTransaction(boolean force) { - for (int i = mChildren.size() - 1; i >= 0; --i) { - final WindowContainer wc = mChildren.get(i); - wc.forceWindowsScaleableInTransaction(force); - } - } - /** * @return {@code true} when an application can override an app transition animation on this * container. diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 0b53bf6ca8f6..3b79241a3c3e 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -2172,16 +2172,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP } } - @Override - void forceWindowsScaleableInTransaction(boolean force) { - if (mWinAnimator != null && mWinAnimator.hasSurface()) { - mWinAnimator.mSurfaceController.forceScaleableInTransaction(force); - } - - super.forceWindowsScaleableInTransaction(force); - } - - @Override + @Override void removeImmediately() { super.removeImmediately(); diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index f3429769893f..6349e6d36ae1 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -971,10 +971,6 @@ class WindowStateAnimator { * @return Returns true if the surface was successfully shown. */ private boolean showSurfaceRobustlyLocked() { - if (mWin.getWindowConfiguration().windowsAreScaleable()) { - mSurfaceController.forceScaleableInTransaction(true); - } - boolean shown = mSurfaceController.showRobustlyInTransaction(); if (!shown) return false; diff --git a/services/core/java/com/android/server/wm/WindowSurfaceController.java b/services/core/java/com/android/server/wm/WindowSurfaceController.java index cbe0a4232c97..d2c36e2bf347 100644 --- a/services/core/java/com/android/server/wm/WindowSurfaceController.java +++ b/services/core/java/com/android/server/wm/WindowSurfaceController.java @@ -342,11 +342,9 @@ class WindowSurfaceController { return false; } - void forceScaleableInTransaction(boolean force) { - // -1 means we don't override the default or client specified - // scaling mode. - int scalingMode = force ? SCALING_MODE_SCALE_TO_WINDOW : -1; - mSurfaceControl.setOverrideScalingMode(scalingMode); + void deferTransactionUntil(SurfaceControl barrier, long frame) { + // TODO: Logging + mSurfaceControl.deferTransactionUntil(barrier, frame); } boolean clearWindowContentFrameStats() { |