Revert "Using Transaction directly instead of building surface p..."

Revert "Removing unused surface transaction wrappers"

Revert submission 19933596-tcompat

Reason for revert: b/246899728
Reverted Changes:
I31123dff7:Using Transaction directly instead of building sur...
I2e2526d21:Removing unused surface transaction wrappers

Change-Id: I63d1d8bb723b7bd05d345fb21a67f88e5fb36bc1
This commit is contained in:
Sunny Goyal
2022-09-15 20:48:09 +00:00
parent 03732ff0f8
commit 9925bbd147
16 changed files with 173 additions and 345 deletions
@@ -24,6 +24,7 @@ import android.graphics.Rect;
import android.graphics.RectF;
import android.util.ArrayMap;
import android.view.Surface;
import android.view.SurfaceControl;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest;
@@ -41,8 +42,8 @@ import com.android.launcher3.util.window.CachedDisplayInfo;
import com.android.launcher3.util.window.WindowManagerProxy;
import com.android.quickstep.FallbackActivityInterface;
import com.android.quickstep.SystemUiProxy;
import com.android.quickstep.util.RecordingSurfaceTransaction.MockProperties;
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
import org.hamcrest.Description;
import org.hamcrest.TypeSafeMatcher;
@@ -206,21 +207,17 @@ public class TaskViewSimulatorTest {
}
@Override
public SurfaceTransaction createSurfaceParams(BuilderProxy proxy) {
RecordingSurfaceTransaction transaction = new RecordingSurfaceTransaction();
proxy.onBuildTargetParams(
transaction.mockProperties, mock(RemoteAnimationTargetCompat.class), this);
return transaction;
public SurfaceParams[] createSurfaceParams(BuilderProxy proxy) {
SurfaceParams.Builder builder = new SurfaceParams.Builder((SurfaceControl) null);
proxy.onBuildTargetParams(builder, mock(RemoteAnimationTargetCompat.class), this);
return new SurfaceParams[] {builder.build()};
}
@Override
public void applySurfaceParams(SurfaceTransaction params) {
Assert.assertTrue(params instanceof RecordingSurfaceTransaction);
MockProperties p = ((RecordingSurfaceTransaction) params).mockProperties;
public void applySurfaceParams(SurfaceParams[] params) {
// Verify that the task position remains the same
RectF newAppBounds = new RectF(mAppBounds);
p.matrix.mapRect(newAppBounds);
params[0].matrix.mapRect(newAppBounds);
Assert.assertThat(newAppBounds, new AlmostSame(mAppBounds));
System.err.println("Bounds mapped: " + mAppBounds + " => " + newAppBounds);