summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2013-03-14 03:30:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-14 03:30:34 +0000
commit278fb4714d77bc0f9fe64a774b3a59561d51ad68 (patch)
tree716620d0c2d721b37d2036d1cb93c4cad2efc180
parentcd5c7040e91e0bdb3b966642d91b6de290fd1035 (diff)
parenteb8ffe4b5f1c69ec037b5c2aecd97cb9bd20afbb (diff)
downloadandroid_packages_apps_Snap-278fb4714d77bc0f9fe64a774b3a59561d51ad68.tar.gz
android_packages_apps_Snap-278fb4714d77bc0f9fe64a774b3a59561d51ad68.tar.bz2
android_packages_apps_Snap-278fb4714d77bc0f9fe64a774b3a59561d51ad68.zip
Merge "Fix photo editor RS allocation on orientation change." into gb-ub-photos-bryce
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 37b2cd9da..0ed90c4fe 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -138,6 +138,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
clearGalleryBitmapPool();
setupMasterImage();
+ ImageFilterRS.setRenderScriptContext(this);
setDefaultValues();
fillEditors();
@@ -343,7 +344,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
private void setDefaultValues() {
ImageFilter.setActivityForMemoryToasts(this);
- ImageFilterRS.setRenderScriptContext(this);
Resources res = getResources();
// TODO: add a mechanism to set the resources in FiltersManagmer