1 files changed, 28 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index e5ddbf5da..27b5fb914 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -69,6 +69,8 @@ import com.android.gallery3d.filtershow.provider.SharedImageProvider;
 import com.android.gallery3d.filtershow.state.StateAdapter;
 import com.android.gallery3d.filtershow.tools.BitmapTask;
 import com.android.gallery3d.filtershow.tools.SaveCopyTask;
+import com.android.gallery3d.filtershow.tools.XmpPresets;
+import com.android.gallery3d.filtershow.tools.XmpPresets.XMresults;
 import com.android.gallery3d.filtershow.ui.FramedTextButton;
 import com.android.gallery3d.filtershow.ui.Spline;
 import com.android.gallery3d.util.GalleryUtils;
@@ -119,6 +121,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
     private LoadBitmapTask mLoadBitmapTask;
     private boolean mLoading = true;
 
+    private Uri mOriginalImageUri = null;
+    private ImagePreset mOriginalPreset = null;
+
     private CategoryAdapter mCategoryLooksAdapter = null;
     private CategoryAdapter mCategoryBordersAdapter = null;
     private CategoryAdapter mCategoryGeometryAdapter = null;
@@ -147,6 +152,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
 
         setDefaultPreset();
 
+        extractXMPData();
         processIntent();
     }
 
@@ -285,9 +291,12 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
         }
 
         mAction = intent.getAction();
-
-        if (intent.getData() != null) {
-            startLoadBitmap(intent.getData());
+        Uri srcUri = intent.getData();
+        if (mOriginalImageUri != null) {
+            srcUri = mOriginalImageUri;
+        }
+        if (srcUri != null) {
+            startLoadBitmap(srcUri);
         } else {
             pickImage();
         }
@@ -364,8 +373,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
 
         for (int i = 0; i < borders.size(); i++) {
             FilterRepresentation filter = borders.elementAt(i);
+            filter.setScrName(getString(R.string.borders));
             if (i == 0) {
-                filter.setName(getString(R.string.none));
+                filter.setScrName(getString(R.string.none));
             }
         }
 
@@ -519,6 +529,11 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
             mCategoryFiltersAdapter.imageLoaded();
             mLoadBitmapTask = null;
 
+            if (mOriginalPreset != null) {
+                MasterImage.getImage().setPreset(mOriginalPreset, true);
+                mOriginalPreset = null;
+            }
+
             if (mAction == TINY_PLANET_ACTION) {
                 showRepresentation(mCategoryFiltersAdapter.getTinyPlanet());
             }
@@ -1053,4 +1068,13 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
         System.loadLibrary("jni_filtershow_filters");
     }
 
+    private void extractXMPData() {
+        XMresults res = XmpPresets.extractXMPData(
+                getBaseContext(), mMasterImage, getIntent().getData());
+        if (res == null)
+            return;
+
+        mOriginalImageUri = res.originalimage;
+        mOriginalPreset = res.preset;
+    }
 }