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

Rename surfaceChanged to setWindowBounds().

Browse Source 
- Removed onLocationChanged() as well from the TaskViewTaskController.
- Also make sure tha the bounds passed in setWindowBounds() are actually applied to the window.

Bug: 265075065
Test: Tested manually
Change-Id: Ibf0be06d4960c6562d3ee4fd4c61d063b175775e
This commit is contained in:
Gaurav Bhola
2023-02-02 18:48:01 +00:00
parent 28d84e5fee
commit fbcd38670e
2 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java
View File

@@ -173,7 +173,7 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback,
*/
public void onLocationChanged() {
getBoundsOnScreen(mTmpRect);
mTaskViewTaskController.onLocationChanged(mTmpRect);
mTaskViewTaskController.setWindowBounds(mTmpRect);
}
/**
@@ -198,7 +198,7 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback,
public void surfaceChanged(@androidx.annotation.NonNull SurfaceHolder holder, int format,
int width, int height) {
getBoundsOnScreen(mTmpRect);
mTaskViewTaskController.surfaceChanged(mTmpRect);
mTaskViewTaskController.setWindowBounds(mTmpRect);
}
@Override

37
libs/WindowManager/Shell/src/com/android/wm/shell/TaskViewTaskController.java
View File

@@ -182,26 +182,6 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener {
options.setRemoveWithTaskOrganizer(true);
}
/**
* Call when view position or size has changed. Do not call when animating.
*/
public void onLocationChanged(Rect newBounds) {
if (mTaskToken == null) {
return;
}
// Sync Transactions can't operate simultaneously with shell transition collection.
// The transition animation (upon showing) will sync the location itself.
if (isUsingShellTransitions() && mTaskViewTransitions.hasPending()) return;
WindowContainerTransaction wct = new WindowContainerTransaction();
updateWindowBounds(wct);
mSyncQueue.queue(wct);
}
private void updateWindowBounds(WindowContainerTransaction wct) {
wct.setBounds(mTaskToken, mTaskViewBase.getCurrentBoundsOnScreen());
}
/**
* Release this container if it is initialized.
*/
@@ -394,15 +374,24 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener {
}
/**
* Should be called when the client surface is changed.
* Sets the window bounds to {@code boundsOnScreen}.
* Call when view position or size has changed. Can also be called before the animation when
* the final bounds are known.
* Do not call during the animation.
*
* @param boundsOnScreen the on screen bounds of the surface view.
*/
public void surfaceChanged(Rect boundsOnScreen) {
public void setWindowBounds(Rect boundsOnScreen) {
if (mTaskToken == null) {
return;
}
onLocationChanged(boundsOnScreen);
// Sync Transactions can't operate simultaneously with shell transition collection.
// The transition animation (upon showing) will sync the location itself.
if (isUsingShellTransitions() && mTaskViewTransitions.hasPending()) return;
WindowContainerTransaction wct = new WindowContainerTransaction();
wct.setBounds(mTaskToken, boundsOnScreen);
mSyncQueue.queue(wct);
}
/** Should be called when the client surface is destroyed. */
@@ -493,7 +482,7 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener {
.setPosition(mTaskLeash, 0, 0)
.apply();
updateWindowBounds(wct);
wct.setBounds(mTaskToken, mTaskViewBase.getCurrentBoundsOnScreen());
} else {
// The surface has already been destroyed before the task has appeared,
// so go ahead and hide the task entirely