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

Commit 3c347ee9 authored by Miao Wang's avatar Miao Wang Committed by android-build-merger
Browse files

Merge "Revert "Revert "Revert "Make Gallery2 use platform RenderScript"""" am:... 

Merge "Revert "Revert "Revert "Make Gallery2 use platform RenderScript"""" am: 7982e887 am: d762ffe7
am: 86cfcda8

* commit '86cfcda8':
  Revert "Revert "Revert "Make Gallery2 use platform RenderScript"""
parents 11e5fc98 86cfcda8

Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 
LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2

LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit

LOCAL_STATIC_JAVA_LIBRARIES += mp4parser

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v8-renderscript



LOCAL_RENDERSCRIPT_TARGET_API := 18

LOCAL_RENDERSCRIPT_COMPATIBILITY := 18

LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript



LOCAL_SRC_FILES := \

    $(call all-java-files-under, src) \
@@ -24,7 +29,7 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D 


LOCAL_SDK_VERSION := current



LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters libjni_jpegstream

LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream



LOCAL_PROGUARD_FLAG_FILES := proguard.flags

proguard.flags

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 
# Disable the warnings of using dynamic method calls in EffectsRecorder

-dontnote com.android.camera.EffectsRecorder



-keep class android.support.v8.renderscript.** { *; }



# Required for ActionBarSherlock

-keep class android.support.v4.app.** { *; }

-keep interface android.support.v4.app.** { *; }

src/com/android/gallery3d/filtershow/filters/ImageFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.filters; 
import android.app.Activity;

import android.graphics.Bitmap;

import android.graphics.Matrix;

import android.renderscript.Allocation;

import android.support.v8.renderscript.Allocation;

import android.widget.Toast;



import com.android.gallery3d.filtershow.imageshow.GeometryMathUtils;

src/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java

+5 −5
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ package com.android.gallery3d.filtershow.filters; 


import android.graphics.Bitmap;

import android.graphics.Matrix;

import android.renderscript.Allocation;

import android.renderscript.Element;

import android.renderscript.RenderScript;

import android.renderscript.Script.LaunchOptions;

import android.renderscript.Type;

import android.support.v8.renderscript.Allocation;

import android.support.v8.renderscript.Element;

import android.support.v8.renderscript.RenderScript;

import android.support.v8.renderscript.Script.LaunchOptions;

import android.support.v8.renderscript.Type;



import com.android.gallery3d.R;

import com.android.gallery3d.filtershow.pipeline.FilterEnvironment;

src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java

+5 −5
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ import com.android.gallery3d.filtershow.pipeline.FilterEnvironment; 
import android.graphics.Bitmap;

import android.graphics.Color;

import android.graphics.Matrix;

import android.renderscript.Allocation;

import android.renderscript.Element;

import android.renderscript.RenderScript;

import android.renderscript.Script.LaunchOptions;

import android.renderscript.Type;

import android.support.v8.renderscript.Allocation;

import android.support.v8.renderscript.Element;

import android.support.v8.renderscript.RenderScript;

import android.support.v8.renderscript.Script.LaunchOptions;

import android.support.v8.renderscript.Type;

import android.util.Log;



import com.android.gallery3d.R;