aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-18 10:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "[DO NOT MERGE] Removing junit.framework.Assert from wallpaper picker code" into ub-launcher3-almonte

Browse Source
This commit is contained in:
Sunny Goyal
2015-06-26 22:43:00 +00:00
committed by Android (Google) Code Review
parent 42ea0db889 1a4b1eacd6
commit c767689be7
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WallpaperPicker/src/com/android/gallery3d/glrenderer/BitmapTexture.java
View File

@@ -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;
}

4
WallpaperPicker/src/com/android/gallery3d/glrenderer/GLPaint.java
View File

@@ -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;
}

6
WallpaperPicker/src/com/android/gallery3d/glrenderer/UploadedTexture.java
View File

@@ -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);
assertTrue(bWidth <= texWidth && bHeight <= texHeight);
// Upload the bitmap to a new texture.
mId = canvas.getGLId().generateTexture();