Updates captureToBitmap in ViewCapture to treat API 34 the same way t…

…hat all previous API works. Because API 34 wasn't getting the surface, it was including the action bar and messing up the screenshots. By removing it, it will use the surface instead and it works perfectly. PiperOrigin-RevId: 588915479
android · Dec 19, 2023 · 9a5eb38 · 9a5eb38
1 parent dd3de37
commit 9a5eb38
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 **Bug Fixes**
 
+* ViewCapture.captureToBitmap API 34 now uses the surface directly to take the screenshot.
+
 **New Features**
 
 **Breaking Changes**

diff --git a/core/java/androidx/test/core/view/ViewCapture.kt b/core/java/androidx/test/core/view/ViewCapture.kt
@@ -128,7 +128,6 @@ private fun View.generateBitmap(bitmapFuture: ResolvableFuture<Bitmap>, rect: Re
   val destBitmap = Bitmap.createBitmap(rectWidth, rectHeight, Bitmap.Config.ARGB_8888)
   when {
     Build.VERSION.SDK_INT < 26 -> generateBitmapFromDraw(destBitmap, bitmapFuture, rect)
-    Build.VERSION.SDK_INT >= 34 -> generateBitmapFromPixelCopy(destBitmap, bitmapFuture, rect)
     this is SurfaceView -> generateBitmapFromSurfaceViewPixelCopy(destBitmap, bitmapFuture, rect)
     else -> generateBitmapFromPixelCopy(this.getSurface(), destBitmap, bitmapFuture, rect)
   }