diff options
author | ztenghui <ztenghui@google.com> | 2013-06-28 16:27:56 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-28 16:27:57 +0000 |
commit | cbb45ff9079b4f1ec19f26a1a43fb72e2c179502 (patch) | |
tree | c305a11f1fda4729ab40c0d950468a8ab21121c0 | |
parent | bfb76a89af606e65eb34099d08c27b471f8d1b29 (diff) | |
parent | 59e60d36233f4acd67c4542bf849a0bcfce54adc (diff) | |
download | android_packages_apps_Snap-cbb45ff9079b4f1ec19f26a1a43fb72e2c179502.tar.gz android_packages_apps_Snap-cbb45ff9079b4f1ec19f26a1a43fb72e2c179502.tar.bz2 android_packages_apps_Snap-cbb45ff9079b4f1ec19f26a1a43fb72e2c179502.zip |
Merge "Add a switch to turn on/off the aux directory saving" into gb-ub-photos-carlsbad
-rw-r--r-- | src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java b/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java index 9e96e96c3..ee2ce9672 100644 --- a/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java +++ b/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java @@ -74,6 +74,11 @@ public class SaveCopyTask extends AsyncTask<ImagePreset, Void, Uri> { private static final String POSTFIX_JPG = ".jpg"; private static final String AUX_DIR_NAME = ".aux"; + // When this is true, the source file will be saved into auxiliary directory + // and hidden from MediaStore. Otherwise, the source will be kept as the + // same. + private static final boolean USE_AUX_DIR = true; + private final Context mContext; private final Uri mSourceUri; private final Callback mCallback; @@ -283,8 +288,12 @@ public class SaveCopyTask extends AsyncTask<ImagePreset, Void, Uri> { // If necessary, move the source file into the auxiliary directory, // newSourceUri is then pointing to the new location. // If no file is moved, newSourceUri will be the same as mSourceUri. - Uri newSourceUri = moveSrcToAuxIfNeeded(mSourceUri, mDestinationFile); - + Uri newSourceUri; + if (USE_AUX_DIR) { + newSourceUri = moveSrcToAuxIfNeeded(mSourceUri, mDestinationFile); + } else { + newSourceUri = mSourceUri; + } // Stopgap fix for low-memory devices. while (noBitmap) { try { @@ -321,13 +330,14 @@ public class SaveCopyTask extends AsyncTask<ImagePreset, Void, Uri> { // Since we have a new image inserted to media store, we can // safely remove the old one which is selected by the user. - String scheme = mSelectedImageUri.getScheme(); - if (scheme != null && scheme.equals(ContentResolver.SCHEME_CONTENT)) { - if (mSelectedImageUri.getAuthority().equals(MediaStore.AUTHORITY)) { - mContext.getContentResolver().delete(mSelectedImageUri, null, null); + if (USE_AUX_DIR) { + String scheme = mSelectedImageUri.getScheme(); + if (scheme != null && scheme.equals(ContentResolver.SCHEME_CONTENT)) { + if (mSelectedImageUri.getAuthority().equals(MediaStore.AUTHORITY)) { + mContext.getContentResolver().delete(mSelectedImageUri, null, null); + } } } - noBitmap = false; UsageStatistics.onEvent(UsageStatistics.COMPONENT_EDITOR, "SaveComplete", null); |