diff --git a/app/build.gradle b/app/build.gradle index e31db384..db0ac695 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -61,7 +61,6 @@ android { targetSdkVersion 23 renderscriptTargetApi 23 - renderscriptSupportModeEnabled true applicationId "com.kabouzeid.gramophone" versionCode 80 diff --git a/app/src/main/java/com/kabouzeid/gramophone/imageloader/BlurProcessor.java b/app/src/main/java/com/kabouzeid/gramophone/imageloader/BlurProcessor.java index f30a3b36..93139ed3 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/imageloader/BlurProcessor.java +++ b/app/src/main/java/com/kabouzeid/gramophone/imageloader/BlurProcessor.java @@ -4,13 +4,14 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Paint; +import android.os.Build; +import android.renderscript.Allocation; +import android.renderscript.Element; +import android.renderscript.RSRuntimeException; +import android.renderscript.RenderScript; +import android.renderscript.ScriptIntrinsicBlur; import android.support.annotation.FloatRange; import android.support.annotation.NonNull; -import android.support.v8.renderscript.Allocation; -import android.support.v8.renderscript.Element; -import android.support.v8.renderscript.RSRuntimeException; -import android.support.v8.renderscript.RenderScript; -import android.support.v8.renderscript.ScriptIntrinsicBlur; import com.kabouzeid.gramophone.BuildConfig; import com.kabouzeid.gramophone.helper.StackBlur; @@ -56,28 +57,30 @@ public class BlurProcessor implements BitmapProcessor { paint.setFlags(Paint.FILTER_BITMAP_FLAG); canvas.drawBitmap(bitmap, 0, 0, paint); - try { - final RenderScript rs = RenderScript.create(context.getApplicationContext()); - final Allocation input = Allocation.createFromBitmap(rs, out, Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); - final Allocation output = Allocation.createTyped(rs, input.getType()); - final ScriptIntrinsicBlur script = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs)); + if (Build.VERSION.SDK_INT > 16) { + try { + final RenderScript rs = RenderScript.create(context.getApplicationContext()); + final Allocation input = Allocation.createFromBitmap(rs, out, Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); + final Allocation output = Allocation.createTyped(rs, input.getType()); + final ScriptIntrinsicBlur script = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs)); - script.setRadius(blurRadius); - script.setInput(input); - script.forEach(output); + script.setRadius(blurRadius); + script.setInput(input); + script.forEach(output); - output.copyTo(out); + output.copyTo(out); - rs.destroy(); + rs.destroy(); - return out; + return out; - } catch (RSRuntimeException e) { - // on some devices RenderScript.create() throws: android.support.v8.renderscript.RSRuntimeException: Error loading libRSSupport library - if (BuildConfig.DEBUG) e.printStackTrace(); - - return StackBlur.blur(out, blurRadius); + } catch (RSRuntimeException e) { + // on some devices RenderScript.create() throws: android.support.v8.renderscript.RSRuntimeException: Error loading libRSSupport library + if (BuildConfig.DEBUG) e.printStackTrace(); + } } + + return StackBlur.blur(out, blurRadius); } public static class Builder { diff --git a/build.gradle b/build.gradle index 6c76e542..ba5f6301 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.0.0-alpha1' classpath 'com.github.triplet.gradle:play-publisher:1.1.3' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a4e3eb..382b3953 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Mon Nov 23 22:29:57 CET 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip