summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java1
-rw-r--r--src/com/android/gallery3d/filtershow/HistoryAdapter.java9
2 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index ff6e46635..81c171758 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -505,6 +505,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
}
pipeline.turnOnPipeline(true);
MasterImage.getImage().setOriginalGeometry(largeBitmap);
+ MasterImage.getImage().getHistory().setOriginalBitmap(mImageLoader.getOriginalBitmapSmall());
mLoadBitmapTask = null;
if (mAction == CROP_ACTION) {
diff --git a/src/com/android/gallery3d/filtershow/HistoryAdapter.java b/src/com/android/gallery3d/filtershow/HistoryAdapter.java
index 2afb7d2a6..8d682465a 100644
--- a/src/com/android/gallery3d/filtershow/HistoryAdapter.java
+++ b/src/com/android/gallery3d/filtershow/HistoryAdapter.java
@@ -44,6 +44,8 @@ public class HistoryAdapter extends ArrayAdapter<ImagePreset> {
private MenuItem mRedoMenuItem = null;
private MenuItem mResetMenuItem = null;
+ private Bitmap mOriginalBitmap = null;
+
public HistoryAdapter(Context context, int resource, int textViewResourceId) {
super(context, resource, textViewResourceId);
FilterShowActivity activity = (FilterShowActivity) context;
@@ -199,6 +201,9 @@ public class HistoryAdapter extends ArrayAdapter<ImagePreset> {
}
ImageView preview = (ImageView) view.findViewById(R.id.preview);
Bitmap bmp = item.getPreviewImage();
+ if (position == getCount()-1 && mOriginalBitmap != null) {
+ bmp = mOriginalBitmap;
+ }
if (bmp != null) {
preview.setImageBitmap(bmp);
} else {
@@ -214,4 +219,8 @@ public class HistoryAdapter extends ArrayAdapter<ImagePreset> {
return view;
}
+
+ public void setOriginalBitmap(Bitmap originalBitmap) {
+ mOriginalBitmap = originalBitmap;
+ }
}