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

Merge "Use self's pendingTransaction object when setting position."

Browse Source
This commit is contained in:
Chavi Weingarten
2018-01-31 01:57:55 +00:00
committed by Android (Google) Code Review
parent 32697552f2 2f0567b00d
commit fbcdae0694
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/TaskStack.java
View File

@@ -736,15 +736,11 @@ public class TaskStack extends WindowContainer<Task> implements
}
private void updateSurfaceBounds() {
updateSurfaceBounds(getPendingTransaction());
updateSurfaceSize(getPendingTransaction());
updateSurfacePosition();
scheduleAnimation();
}
void updateSurfaceBounds(SurfaceControl.Transaction transaction) {
updateSurfaceSize(transaction);
updateSurfacePosition(transaction);
}
private void updateSurfaceSize(SurfaceControl.Transaction transaction) {
if (mSurfaceControl == null) {
return;

10
services/core/java/com/android/server/wm/WindowContainer.java
View File

@@ -131,7 +131,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
@Override
public void onConfigurationChanged(Configuration newParentConfig) {
super.onConfigurationChanged(newParentConfig);
updateSurfacePosition(getPendingTransaction());
updateSurfacePosition();
scheduleAnimation();
}
@@ -1204,7 +1204,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
}
}
void updateSurfacePosition(SurfaceControl.Transaction transaction) {
void updateSurfacePosition() {
if (mSurfaceControl == null) {
return;
}
@@ -1214,12 +1214,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
return;
}
transaction.setPosition(mSurfaceControl, mTmpPos.x, mTmpPos.y);
getPendingTransaction().setPosition(mSurfaceControl, mTmpPos.x, mTmpPos.y);
mLastSurfacePosition.set(mTmpPos.x, mTmpPos.y);
for (int i = mChildren.size() - 1; i >= 0; i--) {
mChildren.get(i).updateSurfacePosition(transaction);
}
}
void getRelativePosition(Point outPos) {

8
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -4519,7 +4519,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
if (dimmer != null) {
applyDims(dimmer);
}
updateSurfacePosition(mPendingTransaction);
updateSurfacePosition();
mWinAnimator.prepareSurfaceLocked(true);
super.prepareSurfaces();
@@ -4541,7 +4541,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
}
@Override
void updateSurfacePosition(Transaction t) {
void updateSurfacePosition() {
updateSurfacePosition(getPendingTransaction());
}
private void updateSurfacePosition(Transaction t) {
if (mSurfaceControl == null) {
return;
}