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

Merge "Replace PixelColor ints with Color ints"

Browse Source
This commit is contained in:
Patrick Williams
2023-01-05 17:57:54 +00:00
committed by Android (Google) Code Review
parent 5130279d9e f1968da159
commit e768daa3f2
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/tests/wmtests/src/com/android/server/wm/ScreenshotTests.java
View File

@@ -48,7 +48,6 @@ import android.view.IWindowManager;
import android.view.PointerIcon;
import android.view.SurfaceControl;
import android.view.cts.surfacevalidator.BitmapPixelChecker;
import android.view.cts.surfacevalidator.PixelColor;
import android.view.cts.surfacevalidator.SaveBitmapHelper;
import android.window.ScreenCapture;
import android.window.ScreenCapture.ScreenCaptureListener;
@@ -132,7 +131,7 @@ public class ScreenshotTests {
Bitmap swBitmap = screenshot.copy(Bitmap.Config.ARGB_8888, false);
screenshot.recycle();
BitmapPixelChecker bitmapPixelChecker = new BitmapPixelChecker(PixelColor.RED);
BitmapPixelChecker bitmapPixelChecker = new BitmapPixelChecker(Color.RED);
Rect bounds = new Rect(0, 0, swBitmap.getWidth(), swBitmap.getHeight());
int numMatchingPixels = bitmapPixelChecker.getNumMatchingPixels(swBitmap, bounds);
int sizeOfBitmap = bounds.width() * bounds.height();
@@ -182,7 +181,7 @@ public class ScreenshotTests {
Bitmap swBitmap = screenshot.copy(Bitmap.Config.ARGB_8888, false);
screenshot.recycle();
BitmapPixelChecker bitmapPixelChecker = new BitmapPixelChecker(PixelColor.RED);
BitmapPixelChecker bitmapPixelChecker = new BitmapPixelChecker(Color.RED);
Rect bounds = new Rect(point.x, point.y, BUFFER_WIDTH + point.x, BUFFER_HEIGHT + point.y);
int numMatchingPixels = bitmapPixelChecker.getNumMatchingPixels(swBitmap, bounds);
int pixelMatchSize = bounds.width() * bounds.height();

3
tests/SurfaceViewBufferTests/src/com/android/test/SharedBufferModeScreenRecordTests.kt
View File

@@ -18,7 +18,6 @@ package com.android.test
import android.graphics.Color
import android.graphics.Rect
import android.os.SystemClock
import android.view.cts.surfacevalidator.PixelColor
import junit.framework.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
@@ -53,7 +52,7 @@ class SharedBufferModeScreenRecordTests(useBlastAdapter: Boolean) :
SystemClock.sleep(4000)
}
val result = withScreenRecording(svBounds, PixelColor.RED) {
val result = withScreenRecording(svBounds, Color.RED) {
it.mSurfaceProxy.drawBuffer(0, Color.RED)
}
val failRatio = 1.0f * result.failFrames / (result.failFrames + result.passFrames)