Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1ec8df5 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Stop using junit classes in production"

parents 538f6fe8 558f4628

src/com/android/gallery3d/glrenderer/BitmapTexture.java

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.gallery3d.glrenderer; 


import android.graphics.Bitmap;



import junit.framework.Assert;

import com.android.gallery3d.common.Utils;



// BitmapTexture is a texture whose content is specified by a fixed Bitmap.

//
@@ -34,7 +34,7 @@ public class BitmapTexture extends UploadedTexture { 


    public BitmapTexture(Bitmap bitmap, boolean hasBorder) {

        super(hasBorder);

        Assert.assertTrue(bitmap != null && !bitmap.isRecycled());

        Utils.assertTrue(bitmap != null && !bitmap.isRecycled());

        mContentBitmap = bitmap;

    }

src/com/android/gallery3d/glrenderer/GLES11Canvas.java

+3 −5
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ import android.util.Log; 
import com.android.gallery3d.common.Utils;

import com.android.gallery3d.util.IntArray;



import junit.framework.Assert;



import java.nio.Buffer;

import java.nio.ByteBuffer;

import java.nio.ByteOrder;
@@ -126,7 +124,7 @@ public class GLES11Canvas implements GLCanvas { 


    @Override

    public void setSize(int width, int height) {

        Assert.assertTrue(width >= 0 && height >= 0);

        Utils.assertTrue(width >= 0 && height >= 0);



        if (mTargetTexture == null) {

            mScreenWidth = width;
@@ -154,7 +152,7 @@ public class GLES11Canvas implements GLCanvas { 


    @Override

    public void setAlpha(float alpha) {

        Assert.assertTrue(alpha >= 0 && alpha <= 1);

        Utils.assertTrue(alpha >= 0 && alpha <= 1);

        mAlpha = alpha;

    }
@@ -165,7 +163,7 @@ public class GLES11Canvas implements GLCanvas { 


    @Override

    public void multiplyAlpha(float alpha) {

        Assert.assertTrue(alpha >= 0 && alpha <= 1);

        Utils.assertTrue(alpha >= 0 && alpha <= 1);

        mAlpha *= alpha;

    }

src/com/android/gallery3d/glrenderer/GLPaint.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.gallery3d.glrenderer;



import junit.framework.Assert;

import com.android.gallery3d.common.Utils;



public class GLPaint {

    private float mLineWidth = 1f;
@@ -31,7 +31,7 @@ public class GLPaint { 
    }



    public void setLineWidth(float width) {

        Assert.assertTrue(width >= 0);

        Utils.assertTrue(width >= 0);

        mLineWidth = width;

    }

src/com/android/gallery3d/glrenderer/ResourceTexture.java

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.content.Context; 
import android.graphics.Bitmap;

import android.graphics.BitmapFactory;



import junit.framework.Assert;

import com.android.gallery3d.common.Utils;



// ResourceTexture is a texture whose Bitmap is decoded from a resource.

// By default ResourceTexture is not opaque.
@@ -30,7 +30,7 @@ public class ResourceTexture extends UploadedTexture { 
    protected final int mResId;



    public ResourceTexture(Context context, int resId) {

        Assert.assertNotNull(context);

        Utils.checkNotNull(context);

        mContext = context;

        mResId = resId;

        setOpaque(false);

src/com/android/gallery3d/glrenderer/UploadedTexture.java

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.graphics.Bitmap; 
import android.graphics.Bitmap.Config;

import android.opengl.GLUtils;



import junit.framework.Assert;

import com.android.gallery3d.common.Utils;



import java.util.HashMap;
@@ -144,7 +144,7 @@ public abstract class UploadedTexture extends BasicTexture { 
    }



    private void freeBitmap() {

        Assert.assertTrue(mBitmap != null);

        Utils.assertTrue(mBitmap != null);

        onFreeBitmap(mBitmap);

        mBitmap = null;

    }
@@ -219,7 +219,7 @@ public abstract class UploadedTexture extends BasicTexture { 
                int texWidth = getTextureWidth();

                int texHeight = getTextureHeight();



                Assert.assertTrue(bWidth <= texWidth && bHeight <= texHeight);

                Utils.assertTrue(bWidth <= texWidth && bHeight <= texHeight);



                // Upload the bitmap to a new texture.

                mId = canvas.getGLId().generateTexture();