fix: resolve conflict (#20)

Co-authored-by: Vittorio Cellucci <[email protected]>
qlik-oss · Feb 25, 2022 · cef93ba · cef93ba
1 parent d1a0453
commit cef93ba
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/android/src/main/java/com/reactnativecarbon/photon/LayerSurfaceView.java b/android/src/main/java/com/reactnativecarbon/photon/LayerSurfaceView.java
@@ -266,23 +266,6 @@ public void surfaceCreated(SurfaceHolder surfaceHolder) {
     }
 
     private void createSurfaces(SurfaceHolder surfaceHolder) {
-<<<<<<< HEAD
-        Rect newRect = surfaceHolder.getSurfaceFrame();
-        boolean frameUpdated = presentRect == null || newRect.width() != presentRect.width() || newRect.height() != presentRect.height();
-        if (presentBitmap == null || frameUpdated) {
-            Rect rect = surfaceHolder.getSurfaceFrame();
-            presentBitmap = Bitmap.createBitmap(rect.width(), rect.height(), Bitmap.Config.ARGB_8888);
-            presentPaint = new Paint();
-            clearPaint = new Paint();
-            clearPaint.setStyle(Paint.Style.FILL);
-            clearPaint.setColor(Color.WHITE);
-            clearPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
-            presentRect = rect;
-            presentPaint.setShader(new BitmapShader(presentBitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP));
-
-            drawBuffer = new DrawBuffer(rect.width(), rect.height());
-        }
-=======
         Rect rect = surfaceHolder.getSurfaceFrame();
         Log.d("LayerSurfaceView", "Surface createSurfaces");
         currentRect = rect;
@@ -295,7 +278,6 @@ private void createSurfaces(SurfaceHolder surfaceHolder) {
         presentPaint.setShader(new BitmapShader(presentBitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP));
         drawBuffer = new DrawBuffer(rect.width(), rect.height());
         surfaceReady = true;
->>>>>>> de272ae (fix: refactor to ts)
     }
 
     public void startDrawThread() {