diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:04:31 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:04:31 +0000 |
| commit | c3ce240332ed5e154999e28c3f2796b77cffc656 (patch) | |
| tree | 95dfd31af85ae4a2c8a34db99e7d65c0760977f7 | |
| parent | 0d99e83c6288c6e01fdd26d3fba4e9d310b88fc6 (diff) | |
| parent | a72ac66eb646fbd6f8f382e3aeed530c2a9744f0 (diff) | |
| download | Gallery2-aml_doc_331120000.tar.gz | |
Snap for 8564071 from a72ac66eb646fbd6f8f382e3aeed530c2a9744f0 to mainline-documentsui-releaseaml_doc_331120000
Change-Id: Iede11f6bb187f25543473146473249b0ee6d5d71
59 files changed, 412 insertions, 373 deletions
diff --git a/Android.bp b/Android.bp index ca9a173ae..73f2f131d 100644 --- a/Android.bp +++ b/Android.bp @@ -1,3 +1,7 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + android_app { name: "Gallery2", @@ -28,6 +32,8 @@ android_app { sdk_version: "current", + target_sdk_version: "28", + jni_libs: [ "libjni_eglfence", "libjni_filtershow_filters", @@ -40,5 +46,7 @@ android_app { libs: ["org.apache.http.legacy"], + optional_uses_libs: ["com.google.android.media.effects"], + jarjar_rules: "jarjar-rules.txt", } diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a08b2bcae..b9cf2a7f1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -7,7 +7,7 @@ <original-package android:name="com.android.gallery3d" /> - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="29" /> + <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="28" /> <permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER" android:protectionLevel="signatureOrSystem" /> @@ -31,6 +31,7 @@ <uses-permission android:name="android.permission.WRITE_SETTINGS" /> <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> <uses-permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER" /> + <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <supports-screens android:smallScreens="false" android:normalScreens="true" android:largeScreens="true" @@ -50,6 +51,7 @@ <uses-library android:name="org.apache.http.legacy" android:required="false" /> <activity android:name="com.android.gallery3d.app.MovieActivity" android:label="@string/movie_view_label" + android:exported="true" android:configChanges="orientation|keyboardHidden|screenSize"> <intent-filter> <action android:name="android.intent.action.VIEW" /> @@ -88,6 +90,7 @@ </activity> <activity android:name="com.android.gallery3d.app.GalleryActivity" android:label="@string/app_name" + android:exported="true" android:configChanges="keyboardHidden|orientation|screenSize"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -159,6 +162,7 @@ <!-- This activity acts as a trampoline to the new Gallery activity, so that existing shortcuts are preserved. --> <activity android:name="com.android.gallery3d.app.Gallery" + android:exported="true" android:theme="@style/android:Theme.NoDisplay"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -171,6 +175,7 @@ <activity-alias android:name="com.cooliris.media.Gallery" android:targetActivity="com.android.gallery3d.app.GalleryActivity" android:configChanges="keyboardHidden|orientation|screenSize" + android:exported="true" android:label="@string/app_name"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -187,6 +192,7 @@ android:theme="@style/android:Theme.NoDisplay" /> <activity-alias android:name="com.android.camera.CameraLauncher" android:label="@string/camera_label" + android:exported="true" android:targetActivity="com.android.camera.CameraActivity"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -199,6 +205,7 @@ <activity android:launchMode="singleInstance" android:taskAffinity="" android:name="com.android.gallery3d.ingest.IngestActivity" android:configChanges="orientation|screenSize" + android:exported="true" android:label="@string/app_name"> <intent-filter> <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" /> @@ -210,12 +217,8 @@ <activity android:name="com.android.gallery3d.app.Wallpaper" android:configChanges="keyboardHidden|orientation|screenSize" + android:exported="true" android:theme="@style/android:Theme.Translucent.NoTitleBar"> - <intent-filter android:label="@string/camera_setas_wallpaper"> - <action android:name="android.intent.action.ATTACH_DATA" /> - <data android:mimeType="image/*" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> <intent-filter android:label="@string/app_name"> <action android:name="android.intent.action.SET_WALLPAPER" /> <category android:name="android.intent.category.DEFAULT" /> @@ -224,6 +227,7 @@ android:resource="@xml/wallpaper_picker_preview" /> </activity> <activity android:name="com.android.gallery3d.app.TrimVideo" + android:exported="true" android:label="@string/trim_label"> <intent-filter android:label="@string/crop_label"> <action android:name="com.android.camera.action.TRIM" /> @@ -249,6 +253,7 @@ android:name="com.android.gallery3d.filtershow.FilterShowActivity" android:label="@string/title_activity_filter_show" android:theme="@style/Theme.FilterShow" + android:exported="true" android:configChanges="keyboardHidden|orientation|screenSize"> <intent-filter> <action android:name="android.intent.action.EDIT" /> @@ -266,6 +271,7 @@ android:name="com.android.gallery3d.filtershow.crop.CropActivity" android:label="@string/crop" android:theme="@style/Theme.Crop" + android:exported="true" android:configChanges="keyboardHidden|orientation|screenSize"> <intent-filter android:label="@string/crop_label"> <action android:name="com.android.camera.action.CROP" /> @@ -308,6 +314,7 @@ android:theme="@style/Theme.Gallery.Dialog"/> <receiver android:name="com.android.gallery3d.gadget.PhotoAppWidgetProvider" + android:exported="true" android:label="@string/appwidget_title"> <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> @@ -315,7 +322,8 @@ <meta-data android:name="android.appwidget.provider" android:resource="@xml/widget_info" /> </receiver> - <receiver android:name="com.android.gallery3d.app.PackagesMonitor"> + <receiver android:name="com.android.gallery3d.app.PackagesMonitor" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.PACKAGE_ADDED"/> <action android:name="android.intent.action.PACKAGE_REMOVED"/> @@ -330,6 +338,7 @@ android:permission="android.permission.BIND_REMOTEVIEWS"/> <activity android:name="com.android.gallery3d.gadget.WidgetConfigure" android:configChanges="keyboardHidden|orientation|screenSize" + android:exported="true" android:theme="@style/android:Theme.Translucent.NoTitleBar"> <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" /> @@ -337,7 +346,8 @@ </activity> <service android:name="com.android.gallery3d.app.BatchService" /> - <receiver android:name="com.android.camera.DisableCameraReceiver"> + <receiver android:name="com.android.camera.DisableCameraReceiver" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.BOOT_COMPLETED" /> </intent-filter> diff --git a/gallerycommon/Android.bp b/gallerycommon/Android.bp index 9ce3e9ff6..8d12f8895 100644 --- a/gallerycommon/Android.bp +++ b/gallerycommon/Android.bp @@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + java_library { name: "com.android.gallery3d.common2", srcs: ["src/**/*.java"], diff --git a/gallerycommon/src/com/android/gallery3d/common/BlobCache.java b/gallerycommon/src/com/android/gallery3d/common/BlobCache.java index 3c131e591..af9f3d11b 100644 --- a/gallerycommon/src/com/android/gallery3d/common/BlobCache.java +++ b/gallerycommon/src/com/android/gallery3d/common/BlobCache.java @@ -221,7 +221,7 @@ public class BlobCache implements Closeable { return false; } - // Sanity check + // Initial check if (mMaxEntries <= 0) { Log.w(TAG, "invalid max entries"); return false; diff --git a/jni/Android.bp b/jni/Android.bp index 0c0ecb7f8..2fba236ee 100644 --- a/jni/Android.bp +++ b/jni/Android.bp @@ -1,3 +1,7 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + cc_defaults { name: "gallery2_jni_defaults", product_specific: true, @@ -12,6 +16,7 @@ cc_defaults { "-Wno-unused-parameter", ], + header_libs: ["jni_headers"], sdk_version: "9", shared_libs: ["liblog"], } diff --git a/jni_jpegstream/Android.bp b/jni_jpegstream/Android.bp index 49350c6c1..4a3766b6a 100644 --- a/jni_jpegstream/Android.bp +++ b/jni_jpegstream/Android.bp @@ -1,4 +1,8 @@ // Jpeg Streaming native +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + cc_library_shared { name: "libjni_jpegstream", product_specific: true, @@ -20,6 +24,7 @@ cc_library_shared { "-Wextra", "-Werror", ], + header_libs: ["jni_headers"], local_include_dirs: ["src"], sdk_version: "17", stl: "c++_static", diff --git a/res/menu/gallery_multiselect.xml b/res/menu/gallery_multiselect.xml index d9365c1b7..c9441abb7 100644 --- a/res/menu/gallery_multiselect.xml +++ b/res/menu/gallery_multiselect.xml @@ -26,8 +26,4 @@ android:title="@string/mute_action" android:visible="false" android:showAsAction="never" /> - <item android:id="@+id/menu_set_as" - android:title="@string/set_as" - android:visible="false" - android:showAsAction="never" /> -</menu>
\ No newline at end of file +</menu> diff --git a/res/menu/operation.xml b/res/menu/operation.xml index d1791e22f..a7922365f 100644 --- a/res/menu/operation.xml +++ b/res/menu/operation.xml @@ -57,10 +57,6 @@ android:title="@string/crop_action" android:showAsAction="never" android:visible="false" /> - <item android:id="@+id/action_setas" - android:title="@string/set_image" - android:showAsAction="never" - android:visible="false" /> <item android:id="@+id/action_details" android:icon="@drawable/ic_menu_info_details" android:title="@string/details" diff --git a/res/menu/photo.xml b/res/menu/photo.xml index bcd452e28..f23bc9647 100644 --- a/res/menu/photo.xml +++ b/res/menu/photo.xml @@ -66,9 +66,6 @@ <item android:id="@+id/action_mute" android:title="@string/mute_action" android:showAsAction="never" /> - <item android:id="@+id/action_setas" - android:title="@string/set_image" - android:showAsAction="never" /> <item android:id="@+id/action_details" android:title="@string/details" android:showAsAction="never" /> diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index 98f32ebda..207f79e87 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -198,7 +198,7 @@ <string name="editor_grad_contrast">Contrast</string> <!-- Label for the saturation effect [CHAR LIMIT=20] --> <string name="editor_grad_saturation">Saturation</string> - <!-- Label for the Main or Master control for per channel saturation effect [CHAR LIMIT=20] --> + <!-- Label for the Main or Primary control for per channel saturation effect [CHAR LIMIT=20] --> <string name="editor_chan_sat_main">Main</string> <!-- Label for the red control for per channel saturation effect [CHAR LIMIT=20] --> <string name="editor_chan_sat_red">Red</string> diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 915fdab5a..f2d568ec4 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -1090,7 +1090,6 @@ public abstract class PhotoPage extends ActivityState implements case R.id.action_delete: confirmMsg = mActivity.getResources().getQuantityString( R.plurals.delete_selection, 1); - case R.id.action_setas: case R.id.action_rotate_ccw: case R.id.action_rotate_cw: case R.id.action_show_on_map: diff --git a/src/com/android/gallery3d/app/VideoUtils.java b/src/com/android/gallery3d/app/VideoUtils.java index 359cf76f5..b96958672 100644 --- a/src/com/android/gallery3d/app/VideoUtils.java +++ b/src/com/android/gallery3d/app/VideoUtils.java @@ -174,6 +174,11 @@ public class VideoUtils { retrieverSrc.setDataSource(srcPath); String degreesString = retrieverSrc.extractMetadata( MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); + try { + retrieverSrc.release(); + } catch (IOException e) { + // Ignore errors occurred while releasing the MediaMetadataRetriever. + } if (degreesString != null) { int degrees = Integer.parseInt(degreesString); if (degrees >= 0) { diff --git a/src/com/android/gallery3d/app/Wallpaper.java b/src/com/android/gallery3d/app/Wallpaper.java index 2022f5a4a..93595fba5 100644 --- a/src/com/android/gallery3d/app/Wallpaper.java +++ b/src/com/android/gallery3d/app/Wallpaper.java @@ -131,7 +131,7 @@ public class Wallpaper extends Activity { .putExtra(CropExtras.KEY_SPOTLIGHT_Y, spotlightY) .putExtra(CropExtras.KEY_SCALE, true) .putExtra(CropExtras.KEY_SCALE_UP_IF_NEEDED, true) - .putExtra(CropExtras.KEY_SET_AS_WALLPAPER, true); + .putExtra(CropExtras.KEY_SET_AS_WALLPAPER, false); startActivity(cropAndSetWallpaperIntent); finish(); } diff --git a/src/com/android/gallery3d/data/UriImage.java b/src/com/android/gallery3d/data/UriImage.java index b3fe1de03..0e5cd2a3f 100644 --- a/src/com/android/gallery3d/data/UriImage.java +++ b/src/com/android/gallery3d/data/UriImage.java @@ -37,6 +37,7 @@ import java.io.FileNotFoundException; import java.io.InputStream; import java.net.URI; import java.net.URL; +import java.util.Locale; public class UriImage extends MediaItem { private static final String TAG = "UriImage"; @@ -91,7 +92,7 @@ public class UriImage extends MediaItem { } private int openOrDownloadInner(JobContext jc) { - String scheme = mUri.getScheme(); + String scheme = mUri.getScheme().toLowerCase(Locale.ENGLISH); if (ContentResolver.SCHEME_CONTENT.equals(scheme) || ContentResolver.SCHEME_ANDROID_RESOURCE.equals(scheme) || ContentResolver.SCHEME_FILE.equals(scheme)) { diff --git a/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java b/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java index 95fc56d4f..8c447b40b 100644 --- a/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java +++ b/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.android.gallery3d.filtershow; import android.view.View; diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 937c5290b..e827b82aa 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -101,7 +101,7 @@ import com.android.gallery3d.filtershow.filters.ImageFilter; import com.android.gallery3d.filtershow.history.HistoryItem; import com.android.gallery3d.filtershow.history.HistoryManager; import com.android.gallery3d.filtershow.imageshow.ImageShow; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.imageshow.Spline; import com.android.gallery3d.filtershow.info.InfoPanel; import com.android.gallery3d.filtershow.pipeline.CachingPipeline; @@ -131,7 +131,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL DialogInterface.OnDismissListener, PopupMenu.OnDismissListener{ private String mAction = ""; - MasterImage mMasterImage = null; + PrimaryImage mPrimaryImage = null; private static final long LIMIT_SUPPORTS_HIGHRES = 134217728; // 128Mb @@ -250,12 +250,12 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } public void updateUIAfterServiceStarted() { - MasterImage.setMaster(mMasterImage); + PrimaryImage.setPrimary(mPrimaryImage); ImageFilter.setActivityForMemoryToasts(this); mUserPresetsManager = new UserPresetsManager(this); mUserPresetsAdapter = new UserPresetsAdapter(this); - setupMasterImage(); + setupPrimaryImage(); setupMenu(); setDefaultValues(); fillEditors(); @@ -310,7 +310,8 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL EditorPanel panel = new EditorPanel(); panel.setEditor(currentId); FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.remove(getSupportFragmentManager().findFragmentByTag(MainPanel.FRAGMENT_TAG)); + transaction.remove(getSupportFragmentManager().findFragmentByTag( + MainPanel.FRAGMENT_TAG)); transaction.replace(R.id.main_panel_container, panel, MainPanel.FRAGMENT_TAG); transaction.commit(); } @@ -318,7 +319,8 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL Fragment main = getSupportFragmentManager().findFragmentByTag(MainPanel.FRAGMENT_TAG); boolean doAnimation = false; if (mShowingImageStatePanel - && getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { + && getResources().getConfiguration().orientation == + Configuration.ORIENTATION_PORTRAIT) { doAnimation = true; } if (doAnimation && main != null && main instanceof MainPanel) { @@ -381,7 +383,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } public void setupStatePanel() { - MasterImage.getImage().setHistoryManager(mMasterImage.getHistory()); + PrimaryImage.getImage().setHistoryManager(mPrimaryImage.getHistory()); } private void fillVersions() { @@ -412,7 +414,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL getString(R.string.filtershow_version_original), new ImagePreset(), -1); mCategoryVersionsAdapter.add( new Action(this, originalRep, Action.FULL_VIEW)); - ImagePreset current = new ImagePreset(MasterImage.getImage().getPreset()); + ImagePreset current = new ImagePreset(PrimaryImage.getImage().getPreset()); FilterUserPresetRepresentation currentRep = new FilterUserPresetRepresentation( getString(R.string.filtershow_version_current), current, -1); mCategoryVersionsAdapter.add( @@ -428,7 +430,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } public void addCurrentVersion() { - ImagePreset current = new ImagePreset(MasterImage.getImage().getPreset()); + ImagePreset current = new ImagePreset(PrimaryImage.getImage().getPreset()); mVersionsCounter++; FilterUserPresetRepresentation rep = new FilterUserPresetRepresentation( "" + mVersionsCounter, current, -1); @@ -603,13 +605,13 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL if (filterRepresentation == null) { return; } - ImagePreset oldPreset = MasterImage.getImage().getPreset(); + ImagePreset oldPreset = PrimaryImage.getImage().getPreset(); ImagePreset copy = new ImagePreset(oldPreset); copy.removeFilter(filterRepresentation); - MasterImage.getImage().setPreset(copy, copy.getLastRepresentation(), true); - if (MasterImage.getImage().getCurrentFilterRepresentation() == filterRepresentation) { + PrimaryImage.getImage().setPreset(copy, copy.getLastRepresentation(), true); + if (PrimaryImage.getImage().getCurrentFilterRepresentation() == filterRepresentation) { FilterRepresentation lastRepresentation = copy.getLastRepresentation(); - MasterImage.getImage().setCurrentFilterRepresentation(lastRepresentation); + PrimaryImage.getImage().setCurrentFilterRepresentation(lastRepresentation); } } @@ -619,15 +621,15 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } if (!(filterRepresentation instanceof FilterRotateRepresentation) && !(filterRepresentation instanceof FilterMirrorRepresentation) - && MasterImage.getImage().getCurrentFilterRepresentation() == filterRepresentation) { + && PrimaryImage.getImage().getCurrentFilterRepresentation() == filterRepresentation) { return; } if (filterRepresentation instanceof FilterUserPresetRepresentation || filterRepresentation instanceof FilterRotateRepresentation || filterRepresentation instanceof FilterMirrorRepresentation) { - MasterImage.getImage().onNewLook(filterRepresentation); + PrimaryImage.getImage().onNewLook(filterRepresentation); } - ImagePreset oldPreset = MasterImage.getImage().getPreset(); + ImagePreset oldPreset = PrimaryImage.getImage().getPreset(); ImagePreset copy = new ImagePreset(oldPreset); FilterRepresentation representation = copy.getRepresentation(filterRepresentation); if (representation == null) { @@ -646,8 +648,8 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } } } - MasterImage.getImage().setPreset(copy, filterRepresentation, true); - MasterImage.getImage().setCurrentFilterRepresentation(filterRepresentation); + PrimaryImage.getImage().setPreset(copy, filterRepresentation, true); + PrimaryImage.getImage().setCurrentFilterRepresentation(filterRepresentation); } public void showRepresentation(FilterRepresentation representation) { @@ -664,14 +666,14 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL r.cycle(); } if (representation.isBooleanFilter()) { - ImagePreset preset = MasterImage.getImage().getPreset(); + ImagePreset preset = PrimaryImage.getImage().getPreset(); if (preset.getRepresentation(representation) != null) { // remove ImagePreset copy = new ImagePreset(preset); copy.removeFilter(representation); FilterRepresentation filterRepresentation = representation.copy(); - MasterImage.getImage().setPreset(copy, filterRepresentation, true); - MasterImage.getImage().setCurrentFilterRepresentation(null); + PrimaryImage.getImage().setPreset(copy, filterRepresentation, true); + PrimaryImage.getImage().setCurrentFilterRepresentation(null); return; } } @@ -698,10 +700,10 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } public void updateCategories() { - if (mMasterImage == null) { + if (mPrimaryImage == null) { return; } - ImagePreset preset = mMasterImage.getPreset(); + ImagePreset preset = mPrimaryImage.getPreset(); mCategoryLooksAdapter.reflectImagePreset(preset); mCategoryBordersAdapter.reflectImagePreset(preset); } @@ -737,34 +739,34 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL private class LoadHighresBitmapTask extends AsyncTask<Void, Void, Boolean> { @Override protected Boolean doInBackground(Void... params) { - MasterImage master = MasterImage.getImage(); - Rect originalBounds = master.getOriginalBounds(); - if (master.supportsHighRes()) { - int highresPreviewSize = master.getOriginalBitmapLarge().getWidth() * 2; + PrimaryImage primary = PrimaryImage.getImage(); + Rect originalBounds = primary.getOriginalBounds(); + if (primary.supportsHighRes()) { + int highresPreviewSize = primary.getOriginalBitmapLarge().getWidth() * 2; if (highresPreviewSize > originalBounds.width()) { highresPreviewSize = originalBounds.width(); } Rect bounds = new Rect(); - Bitmap originalHires = ImageLoader.loadOrientedConstrainedBitmap(master.getUri(), - master.getActivity(), highresPreviewSize, - master.getOrientation(), bounds); - master.setOriginalBounds(bounds); - master.setOriginalBitmapHighres(originalHires); + Bitmap originalHires = ImageLoader.loadOrientedConstrainedBitmap(primary.getUri(), + primary.getActivity(), highresPreviewSize, + primary.getOrientation(), bounds); + primary.setOriginalBounds(bounds); + primary.setOriginalBitmapHighres(originalHires); mBoundService.setOriginalBitmapHighres(originalHires); - master.warnListeners(); + primary.warnListeners(); } return true; } @Override protected void onPostExecute(Boolean result) { - Bitmap highresBitmap = MasterImage.getImage().getOriginalBitmapHighres(); + Bitmap highresBitmap = PrimaryImage.getImage().getOriginalBitmapHighres(); if (highresBitmap != null) { float highResPreviewScale = (float) highresBitmap.getWidth() - / (float) MasterImage.getImage().getOriginalBounds().width(); + / (float) PrimaryImage.getImage().getOriginalBounds().width(); mBoundService.setHighresPreviewScaleFactor(highResPreviewScale); } - MasterImage.getImage().warnListeners(); + PrimaryImage.getImage().warnListeners(); } } @@ -793,10 +795,10 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL @Override protected Boolean doInBackground(Uri... params) { - if (!MasterImage.getImage().loadBitmap(params[0], mBitmapSize)) { + if (!PrimaryImage.getImage().loadBitmap(params[0], mBitmapSize)) { return false; } - publishProgress(ImageLoader.queryLightCycle360(MasterImage.getImage().getActivity())); + publishProgress(ImageLoader.queryLightCycle360(PrimaryImage.getImage().getActivity())); return true; } @@ -813,7 +815,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL @Override protected void onPostExecute(Boolean result) { - MasterImage.setMaster(mMasterImage); + PrimaryImage.setPrimary(mPrimaryImage); if (isCancelled()) { return; } @@ -840,11 +842,11 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL imageShow.setVisibility(View.VISIBLE); - Bitmap largeBitmap = MasterImage.getImage().getOriginalBitmapLarge(); + Bitmap largeBitmap = PrimaryImage.getImage().getOriginalBitmapLarge(); mBoundService.setOriginalBitmap(largeBitmap); float previewScale = (float) largeBitmap.getWidth() - / (float) MasterImage.getImage().getOriginalBounds().width(); + / (float) PrimaryImage.getImage().getOriginalBounds().width(); mBoundService.setPreviewScaleFactor(previewScale); if (!mShowingTinyPlanet) { mCategoryFiltersAdapter.removeTinyPlanet(); @@ -855,26 +857,26 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL mCategoryFiltersAdapter.imageLoaded(); mLoadBitmapTask = null; - MasterImage.getImage().warnListeners(); + PrimaryImage.getImage().warnListeners(); loadActions(); if (mOriginalPreset != null) { - MasterImage.getImage().setLoadedPreset(mOriginalPreset); - MasterImage.getImage().setPreset(mOriginalPreset, + PrimaryImage.getImage().setLoadedPreset(mOriginalPreset); + PrimaryImage.getImage().setPreset(mOriginalPreset, mOriginalPreset.getLastRepresentation(), true); mOriginalPreset = null; } else { setDefaultPreset(); } - MasterImage.getImage().resetGeometryImages(true); + PrimaryImage.getImage().resetGeometryImages(true); if (mAction == TINY_PLANET_ACTION) { showRepresentation(mCategoryFiltersAdapter.getTinyPlanet()); } LoadHighresBitmapTask highresLoad = new LoadHighresBitmapTask(); highresLoad.execute(); - MasterImage.getImage().warnListeners(); + PrimaryImage.getImage().warnListeners(); super.onPostExecute(result); } @@ -973,7 +975,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); intent.setType(SharedImageProvider.MIME_TYPE); - mSharedOutputFile = SaveImage.getNewFile(this, MasterImage.getImage().getUri()); + mSharedOutputFile = SaveImage.getNewFile(this, PrimaryImage.getImage().getUri()); Uri uri = Uri.withAppendedPath(SharedImageProvider.CONTENT_URI, Uri.encode(mSharedOutputFile.getAbsolutePath())); intent.putExtra(Intent.EXTRA_STREAM, uri); @@ -999,7 +1001,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } private void setupMenu(){ - if (mMenu == null || mMasterImage == null) { + if (mMenu == null || mPrimaryImage == null) { return; } MenuItem undoItem = mMenu.findItem(R.id.undoButton); @@ -1009,7 +1011,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL if (!PrintHelper.systemSupportsPrint()) { printItem.setVisible(false); } - mMasterImage.getHistory().setMenuItems(undoItem, redoItem, resetItem); + mPrimaryImage.getHistory().setMenuItems(undoItem, redoItem, resetItem); } @Override @@ -1032,17 +1034,17 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.undoButton: { - HistoryManager adapter = mMasterImage.getHistory(); + HistoryManager adapter = mPrimaryImage.getHistory(); int position = adapter.undo(); - mMasterImage.onHistoryItemClick(position); + mPrimaryImage.onHistoryItemClick(position); backToMain(); invalidateViews(); return true; } case R.id.redoButton: { - HistoryManager adapter = mMasterImage.getHistory(); + HistoryManager adapter = mPrimaryImage.getHistory(); int position = adapter.redo(); - mMasterImage.onHistoryItemClick(position); + mPrimaryImage.onHistoryItemClick(position); invalidateViews(); return true; } @@ -1079,7 +1081,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } public void print() { - Bitmap bitmap = MasterImage.getImage().getHighresImage(); + Bitmap bitmap = PrimaryImage.getImage().getHighresImage(); PrintHelper printer = new PrintHelper(this); printer.printBitmap("ImagePrint", bitmap); } @@ -1121,7 +1123,8 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } public void updateUserPresetsFromManager() { - ArrayList<FilterUserPresetRepresentation> presets = mUserPresetsManager.getRepresentations(); + ArrayList<FilterUserPresetRepresentation> presets = + mUserPresetsManager.getRepresentations(); if (presets == null) { return; } @@ -1146,7 +1149,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } public void saveCurrentImagePreset(String name) { - mUserPresetsManager.save(MasterImage.getImage().getPreset(), name); + mUserPresetsManager.save(PrimaryImage.getImage().getPreset(), name); } private void deletePreset(int id) { @@ -1193,7 +1196,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL public void setDefaultPreset() { // Default preset (original) ImagePreset preset = new ImagePreset(); // empty - mMasterImage.setPreset(preset, preset.getLastRepresentation(), true); + mPrimaryImage.setPreset(preset, preset.getLastRepresentation(), true); } // ////////////////////////////////////////////////////////////////////////////// @@ -1246,7 +1249,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL super.onConfigurationChanged(newConfig); setDefaultValues(); - if (mMasterImage == null) { + if (mPrimaryImage == null) { return; } loadXML(); @@ -1268,25 +1271,25 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL stopLoadingIndicator(); } - public void setupMasterImage() { + public void setupPrimaryImage() { HistoryManager historyManager = new HistoryManager(); StateAdapter imageStateAdapter = new StateAdapter(this, 0); - MasterImage.reset(); - mMasterImage = MasterImage.getImage(); - mMasterImage.setHistoryManager(historyManager); - mMasterImage.setStateAdapter(imageStateAdapter); - mMasterImage.setActivity(this); + PrimaryImage.reset(); + mPrimaryImage = PrimaryImage.getImage(); + mPrimaryImage.setHistoryManager(historyManager); + mPrimaryImage.setStateAdapter(imageStateAdapter); + mPrimaryImage.setActivity(this); if (Runtime.getRuntime().maxMemory() > LIMIT_SUPPORTS_HIGHRES) { - mMasterImage.setSupportsHighRes(true); + mPrimaryImage.setSupportsHighRes(true); } else { - mMasterImage.setSupportsHighRes(false); + mPrimaryImage.setSupportsHighRes(false); } } void resetHistory() { - HistoryManager adapter = mMasterImage.getHistory(); + HistoryManager adapter = mPrimaryImage.getHistory(); adapter.reset(); HistoryItem historyItem = adapter.getItem(0); ImagePreset original = null; @@ -1299,7 +1302,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL if (historyItem != null) { rep = historyItem.getFilterRepresentation(); } - mMasterImage.setPreset(original, rep, true); + mPrimaryImage.setPreset(original, rep, true); invalidateViews(); backToMain(); } @@ -1307,12 +1310,13 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL public void showDefaultImageView() { mEditorPlaceHolder.hide(); mImageShow.setVisibility(View.VISIBLE); - MasterImage.getImage().setCurrentFilter(null); - MasterImage.getImage().setCurrentFilterRepresentation(null); + PrimaryImage.getImage().setCurrentFilter(null); + PrimaryImage.getImage().setCurrentFilterRepresentation(null); } public void backToMain() { - Fragment currentPanel = getSupportFragmentManager().findFragmentByTag(MainPanel.FRAGMENT_TAG); + Fragment currentPanel = getSupportFragmentManager().findFragmentByTag( + MainPanel.FRAGMENT_TAG); if (currentPanel instanceof MainPanel) { return; } @@ -1322,14 +1326,17 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL @Override public void onBackPressed() { - Fragment currentPanel = getSupportFragmentManager().findFragmentByTag(MainPanel.FRAGMENT_TAG); + Fragment currentPanel = getSupportFragmentManager().findFragmentByTag( + MainPanel.FRAGMENT_TAG); if (currentPanel instanceof MainPanel) { if (!mImageShow.hasModifications()) { done(); } else { AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setMessage(R.string.unsaved).setTitle(R.string.save_before_exit); - builder.setPositiveButton(R.string.save_and_exit, new DialogInterface.OnClickListener() { + builder.setPositiveButton( + R.string.save_and_exit, + new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { saveImage(); @@ -1364,7 +1371,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL @Override public void onItemClick(AdapterView<?> parent, View view, int position, long id) { - mMasterImage.onHistoryItemClick(position); + mPrimaryImage.onHistoryItemClick(position); invalidateViews(); } @@ -1411,7 +1418,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL private void extractXMPData() { XMresults res = XmpPresets.extractXMPData( - getBaseContext(), mMasterImage, getIntent().getData()); + getBaseContext(), mPrimaryImage, getIntent().getData()); if (res == null) return; diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java index 52c296c78..003ff482f 100644 --- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java +++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java @@ -38,7 +38,7 @@ import com.adobe.xmp.XMPMeta; import com.android.gallery3d.common.Utils; import com.android.gallery3d.exif.ExifInterface; import com.android.gallery3d.exif.ExifTag; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.pipeline.FilterEnvironment; import com.android.gallery3d.filtershow.tools.XmpPresets; import com.android.gallery3d.util.XmpUtilHelper; @@ -511,7 +511,7 @@ public final class ImageLoader { public static XMPMeta getXmpObject(Context context) { try { InputStream is = context.getContentResolver().openInputStream( - MasterImage.getImage().getUri()); + PrimaryImage.getImage().getUri()); return XmpUtilHelper.extractXMPMeta(is); } catch (FileNotFoundException e) { return null; @@ -526,7 +526,7 @@ public final class ImageLoader { public static boolean queryLightCycle360(Context context) { InputStream is = null; try { - is = context.getContentResolver().openInputStream(MasterImage.getImage().getUri()); + is = context.getContentResolver().openInputStream(PrimaryImage.getImage().getUri()); XMPMeta meta = XmpUtilHelper.extractXMPMeta(is); if (meta == null) { return false; diff --git a/src/com/android/gallery3d/filtershow/category/Action.java b/src/com/android/gallery3d/filtershow/category/Action.java index b3a4148eb..56082002e 100644 --- a/src/com/android/gallery3d/filtershow/category/Action.java +++ b/src/com/android/gallery3d/filtershow/category/Action.java @@ -35,7 +35,7 @@ import com.android.gallery3d.filtershow.filters.FilterUserPresetRepresentation; import com.android.gallery3d.filtershow.pipeline.RenderingRequest; import com.android.gallery3d.filtershow.pipeline.RenderingRequestCaller; import com.android.gallery3d.filtershow.filters.FilterRepresentation; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.pipeline.ImagePreset; public class Action implements RenderingRequestCaller { @@ -121,11 +121,11 @@ public class Action implements RenderingRequestCaller { if (getType() == Action.ADD_ACTION) { return; } - Bitmap temp = MasterImage.getImage().getTemporaryThumbnailBitmap(); + Bitmap temp = PrimaryImage.getImage().getTemporaryThumbnailBitmap(); if (temp != null) { mImage = temp; } - Bitmap bitmap = MasterImage.getImage().getThumbnailBitmap(); + Bitmap bitmap = PrimaryImage.getImage().getThumbnailBitmap(); if (bitmap != null) { mImageFrame = imageFrame; int w = mImageFrame.width(); @@ -191,7 +191,8 @@ public class Action implements RenderingRequestCaller { if (mOverlayBitmap != null) { if (getRepresentation().getFilterType() == FilterRepresentation.TYPE_BORDER) { Canvas canvas = new Canvas(mImage); - canvas.drawBitmap(mOverlayBitmap, new Rect(0, 0, mOverlayBitmap.getWidth(), mOverlayBitmap.getHeight()), + canvas.drawBitmap(mOverlayBitmap, + new Rect(0, 0, mOverlayBitmap.getWidth(), mOverlayBitmap.getHeight()), new Rect(0, 0, mImage.getWidth(), mImage.getHeight()), new Paint()); } else { Canvas canvas = new Canvas(mImage); @@ -222,8 +223,8 @@ public class Action implements RenderingRequestCaller { public void clearBitmap() { if (mImage != null - && mImage != MasterImage.getImage().getTemporaryThumbnailBitmap()) { - MasterImage.getImage().getBitmapCache().cache(mImage); + && mImage != PrimaryImage.getImage().getTemporaryThumbnailBitmap()) { + PrimaryImage.getImage().getBitmapCache().cache(mImage); } mImage = null; } diff --git a/src/com/android/gallery3d/filtershow/category/MainPanel.java b/src/com/android/gallery3d/filtershow/category/MainPanel.java index 75574c306..a44bf42d6 100644 --- a/src/com/android/gallery3d/filtershow/category/MainPanel.java +++ b/src/com/android/gallery3d/filtershow/category/MainPanel.java @@ -27,7 +27,7 @@ import android.widget.LinearLayout; import com.android.gallery3d.R; import com.android.gallery3d.filtershow.FilterShowActivity; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.state.StatePanel; public class MainPanel extends Fragment { @@ -177,7 +177,7 @@ public class MainPanel extends Fragment { if (mCurrentSelected == GEOMETRY) { return; } - if (MasterImage.getImage().hasTinyPlanet()) { + if (PrimaryImage.getImage().hasTinyPlanet()) { return; } boolean fromRight = isRightAnimation(GEOMETRY); @@ -283,7 +283,8 @@ public class MainPanel extends Fragment { transaction.replace(R.id.state_panel_container, statePanel, StatePanel.FRAGMENT_TAG); } else { container.setVisibility(View.GONE); - Fragment statePanel = getChildFragmentManager().findFragmentByTag(StatePanel.FRAGMENT_TAG); + Fragment statePanel = getChildFragmentManager().findFragmentByTag( + StatePanel.FRAGMENT_TAG); if (statePanel != null) { transaction.remove(statePanel); } diff --git a/src/com/android/gallery3d/filtershow/crop/CropExtras.java b/src/com/android/gallery3d/filtershow/crop/CropExtras.java index 60fe9af53..d6c47b14b 100644 --- a/src/com/android/gallery3d/filtershow/crop/CropExtras.java +++ b/src/com/android/gallery3d/filtershow/crop/CropExtras.java @@ -92,7 +92,7 @@ public class CropExtras { } public boolean getSetAsWallpaper() { - return mSetAsWallpaper; + return false; } public boolean getReturnData() { diff --git a/src/com/android/gallery3d/filtershow/crop/CropView.java b/src/com/android/gallery3d/filtershow/crop/CropView.java index bbb7cfd4c..e753752aa 100644 --- a/src/com/android/gallery3d/filtershow/crop/CropView.java +++ b/src/com/android/gallery3d/filtershow/crop/CropView.java @@ -299,7 +299,7 @@ public class CropView extends View { mScreenBounds = new RectF(0, 0, canvas.getWidth(), canvas.getHeight()); mScreenBounds.inset(mMargin, mMargin); - // If crop object doesn't exist, create it and update it from master + // If crop object doesn't exist, create it and update it from primary // state if (mCropObj == null) { reset(); @@ -310,8 +310,8 @@ public class CropView extends View { if (mDisplayMatrix == null || mDisplayMatrixInverse == null) { mDisplayMatrix = new Matrix(); mDisplayMatrix.reset(); - if (!CropDrawingUtils.setImageToScreenMatrix(mDisplayMatrix, mImageBounds, mScreenBounds, - mRotation)) { + if (!CropDrawingUtils.setImageToScreenMatrix( + mDisplayMatrix, mImageBounds, mScreenBounds, mRotation)) { Log.w(LOGTAG, "failed to get screen matrix"); mDisplayMatrix = null; return; @@ -371,7 +371,8 @@ public class CropView extends View { mSpotX, mSpotY, wpPaint, p); } CropDrawingUtils.drawIndicators(canvas, mCropIndicator, mIndicatorSize, - mScreenCropBounds, mCropObj.isFixedAspect(), decode(mCropObj.getSelectState(), mRotation)); + mScreenCropBounds, mCropObj.isFixedAspect(), + decode(mCropObj.getSelectState(), mRotation)); } } diff --git a/src/com/android/gallery3d/filtershow/editors/Editor.java b/src/com/android/gallery3d/filtershow/editors/Editor.java index e3eec390b..eafd2ab01 100644 --- a/src/com/android/gallery3d/filtershow/editors/Editor.java +++ b/src/com/android/gallery3d/filtershow/editors/Editor.java @@ -36,7 +36,7 @@ import com.android.gallery3d.R; import com.android.gallery3d.filtershow.controller.Control; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.imageshow.ImageShow; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.pipeline.ImagePreset; import java.util.ArrayList; @@ -96,7 +96,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis mEditTitle = editTitle; mFilterTitle = stateButton; mButton = editTitle; - MasterImage.getImage().resetGeometryImages(false); + PrimaryImage.getImage().resetGeometryImages(false); setUtilityPanelUI(actionButton, editControl); } @@ -194,8 +194,9 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis public FilterRepresentation getLocalRepresentation() { if (mLocalRepresentation == null) { - ImagePreset preset = MasterImage.getImage().getPreset(); - FilterRepresentation filterRepresentation = MasterImage.getImage().getCurrentFilterRepresentation(); + ImagePreset preset = PrimaryImage.getImage().getPreset(); + FilterRepresentation filterRepresentation = + PrimaryImage.getImage().getCurrentFilterRepresentation(); mLocalRepresentation = preset.getFilterRepresentationCopyFrom(filterRepresentation); if (mShowParameter == SHOW_VALUE_UNDEFINED && filterRepresentation != null) { boolean show = filterRepresentation.showParameterValue(); @@ -207,7 +208,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis } /** - * Call this to update the preset in MasterImage with the current representation + * Call this to update the preset in PrimaryImage with the current representation * returned by getLocalRepresentation. This causes the preview bitmap to be * regenerated. */ @@ -216,7 +217,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis } /** - * Call this to update the preset in MasterImage with a given representation. + * Call this to update the preset in PrimaryImage with a given representation. * This causes the preview bitmap to be regenerated. */ public void commitLocalRepresentation(FilterRepresentation rep) { @@ -226,22 +227,22 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis } /** - * Call this to update the preset in MasterImage with a collection of FilterRepresentations. + * Call this to update the preset in PrimaryImage with a collection of FilterRepresentations. * This causes the preview bitmap to be regenerated. */ public void commitLocalRepresentation(Collection<FilterRepresentation> reps) { - ImagePreset preset = MasterImage.getImage().getPreset(); + ImagePreset preset = PrimaryImage.getImage().getPreset(); preset.updateFilterRepresentations(reps); if (mButton != null) { updateText(); } if (mChangesGeometry) { // Regenerate both the filtered and the geometry-only bitmaps - MasterImage.getImage().resetGeometryImages(true); + PrimaryImage.getImage().resetGeometryImages(true); } // Regenerate the filtered bitmap. - MasterImage.getImage().invalidateFiltersOnly(); - preset.fillImageStateAdapter(MasterImage.getImage().getState()); + PrimaryImage.getImage().invalidateFiltersOnly(); + preset.fillImageStateAdapter(PrimaryImage.getImage().getState()); } /** diff --git a/src/com/android/gallery3d/filtershow/editors/EditorCrop.java b/src/com/android/gallery3d/filtershow/editors/EditorCrop.java index 6b19d3c2f..b6a698f1a 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorCrop.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorCrop.java @@ -32,7 +32,7 @@ import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.filters.FilterCropRepresentation; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.imageshow.ImageCrop; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; public class EditorCrop extends Editor implements EditorInfo { public static final String TAG = EditorCrop.class.getSimpleName(); @@ -83,8 +83,8 @@ public class EditorCrop extends Editor implements EditorInfo { @Override public void reflectCurrentFilter() { - MasterImage master = MasterImage.getImage(); - master.setCurrentFilterRepresentation(master.getPreset() + PrimaryImage primary = PrimaryImage.getImage(); + primary.setCurrentFilterRepresentation(primary.getPreset() .getFilterWithSerializationName(FilterCropRepresentation.SERIALIZATION_NAME)); super.reflectCurrentFilter(); FilterRepresentation rep = getLocalRepresentation(); diff --git a/src/com/android/gallery3d/filtershow/editors/EditorMirror.java b/src/com/android/gallery3d/filtershow/editors/EditorMirror.java index d6d9ee75d..41cd831ce 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorMirror.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorMirror.java @@ -28,7 +28,7 @@ import com.android.gallery3d.R; import com.android.gallery3d.filtershow.filters.FilterMirrorRepresentation; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.imageshow.ImageMirror; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; public class EditorMirror extends Editor implements EditorInfo { public static final String TAG = EditorMirror.class.getSimpleName(); @@ -52,8 +52,8 @@ public class EditorMirror extends Editor implements EditorInfo { @Override public void reflectCurrentFilter() { - MasterImage master = MasterImage.getImage(); - master.setCurrentFilterRepresentation(master.getPreset() + PrimaryImage primary = PrimaryImage.getImage(); + primary.setCurrentFilterRepresentation(primary.getPreset() .getFilterWithSerializationName(FilterMirrorRepresentation.SERIALIZATION_NAME)); super.reflectCurrentFilter(); FilterRepresentation rep = getLocalRepresentation(); diff --git a/src/com/android/gallery3d/filtershow/editors/EditorPanel.java b/src/com/android/gallery3d/filtershow/editors/EditorPanel.java index 51e01d03a..199ddce8a 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorPanel.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorPanel.java @@ -30,7 +30,7 @@ import com.android.gallery3d.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.history.HistoryManager; import com.android.gallery3d.filtershow.category.MainPanel; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.state.StatePanel; public class EditorPanel extends Fragment { @@ -53,11 +53,11 @@ public class EditorPanel extends Fragment { } public void cancelCurrentFilter() { - MasterImage masterImage = MasterImage.getImage(); - HistoryManager adapter = masterImage.getHistory(); + PrimaryImage primaryImage = PrimaryImage.getImage(); + HistoryManager adapter = primaryImage.getHistory(); int position = adapter.undo(); - masterImage.onHistoryItemClick(position); + primaryImage.onHistoryItemClick(position); ((FilterShowActivity)getActivity()).invalidateViews(); } @@ -145,7 +145,8 @@ public class EditorPanel extends Fragment { StatePanel statePanel = new StatePanel(); transaction.replace(R.id.state_panel_container, statePanel, StatePanel.FRAGMENT_TAG); } else { - Fragment statePanel = getChildFragmentManager().findFragmentByTag(StatePanel.FRAGMENT_TAG); + Fragment statePanel = getChildFragmentManager().findFragmentByTag( + StatePanel.FRAGMENT_TAG); if (child) { statePanel = getFragmentManager().findFragmentByTag(StatePanel.FRAGMENT_TAG); } diff --git a/src/com/android/gallery3d/filtershow/editors/EditorRotate.java b/src/com/android/gallery3d/filtershow/editors/EditorRotate.java index 9452bf0c0..e5d950023 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorRotate.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorRotate.java @@ -28,7 +28,7 @@ import com.android.gallery3d.R; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.filters.FilterRotateRepresentation; import com.android.gallery3d.filtershow.imageshow.ImageRotate; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; public class EditorRotate extends Editor implements EditorInfo { public static final String TAG = EditorRotate.class.getSimpleName(); @@ -52,8 +52,8 @@ public class EditorRotate extends Editor implements EditorInfo { @Override public void reflectCurrentFilter() { - MasterImage master = MasterImage.getImage(); - master.setCurrentFilterRepresentation(master.getPreset() + PrimaryImage primary = PrimaryImage.getImage(); + primary.setCurrentFilterRepresentation(primary.getPreset() .getFilterWithSerializationName(FilterRotateRepresentation.SERIALIZATION_NAME)); super.reflectCurrentFilter(); FilterRepresentation rep = getLocalRepresentation(); diff --git a/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java b/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java index ff84ba8f9..ec6414233 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java @@ -24,7 +24,7 @@ import com.android.gallery3d.R; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.filters.FilterStraightenRepresentation; import com.android.gallery3d.filtershow.imageshow.ImageStraighten; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; public class EditorStraighten extends Editor implements EditorInfo { public static final String TAG = EditorStraighten.class.getSimpleName(); @@ -56,8 +56,8 @@ public class EditorStraighten extends Editor implements EditorInfo { @Override public void reflectCurrentFilter() { - MasterImage master = MasterImage.getImage(); - master.setCurrentFilterRepresentation(master.getPreset().getFilterWithSerializationName( + PrimaryImage primary = PrimaryImage.getImage(); + primary.setCurrentFilterRepresentation(primary.getPreset().getFilterWithSerializationName( FilterStraightenRepresentation.SERIALIZATION_NAME)); super.reflectCurrentFilter(); FilterRepresentation rep = getLocalRepresentation(); diff --git a/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java index c2814432d..5cfafdc1f 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java @@ -24,7 +24,7 @@ import com.android.gallery3d.R; import com.android.gallery3d.filtershow.editors.EditorMirror; import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; import com.android.gallery3d.filtershow.imageshow.GeometryMathUtils; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.pipeline.ImagePreset; import java.io.IOException; @@ -159,7 +159,8 @@ public class FilterMirrorRepresentation extends FilterRepresentation { @Override protected void copyAllParameters(FilterRepresentation representation) { if (!(representation instanceof FilterMirrorRepresentation)) { - throw new IllegalArgumentException("calling copyAllParameters with incompatible types!"); + throw new IllegalArgumentException( + "calling copyAllParameters with incompatible types!"); } super.copyAllParameters(representation); representation.useParametersFrom(this); @@ -168,7 +169,8 @@ public class FilterMirrorRepresentation extends FilterRepresentation { @Override public void useParametersFrom(FilterRepresentation a) { if (!(a instanceof FilterMirrorRepresentation)) { - throw new IllegalArgumentException("calling useParametersFrom with incompatible types!"); + throw new IllegalArgumentException( + "calling useParametersFrom with incompatible types!"); } setMirror(((FilterMirrorRepresentation) a).getMirror()); } diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java index 1fcd3008c..48f2e6ddf 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java @@ -23,7 +23,7 @@ import android.renderscript.Allocation; import android.widget.Toast; import com.android.gallery3d.filtershow.imageshow.GeometryMathUtils; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.pipeline.FilterEnvironment; public abstract class ImageFilter implements Cloneable { @@ -89,7 +89,7 @@ public abstract class ImageFilter implements Cloneable { protected Matrix getOriginalToScreenMatrix(int w, int h) { return GeometryMathUtils.getImageToScreenMatrix(getEnvironment().getImagePreset() - .getGeometryFilters(), true, MasterImage.getImage().getOriginalBounds(), w, h); + .getGeometryFilters(), true, PrimaryImage.getImage().getOriginalBounds(), w, h); } public void setEnvironment(FilterEnvironment environment) { diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java index efb9cde71..41560e454 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java @@ -22,7 +22,7 @@ import android.graphics.Rect; import com.android.gallery3d.R; import com.android.gallery3d.filtershow.cache.ImageLoader; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; public class ImageFilterDownsample extends SimpleImageFilter { private static final String SERIALIZATION_NAME = "DOWNSAMPLE"; @@ -59,7 +59,7 @@ public class ImageFilterDownsample extends SimpleImageFilter { int p = getParameters().getValue(); // size of original precached image - Rect size = MasterImage.getImage().getOriginalBounds(); + Rect size = PrimaryImage.getImage().getOriginalBounds(); int orig_w = size.width(); int orig_h = size.height(); diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java index 8fd5b029e..742a12298 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java @@ -32,7 +32,7 @@ import com.android.gallery3d.R; import com.android.gallery3d.app.Log; import com.android.gallery3d.filtershow.cache.ImageLoader; import com.android.gallery3d.filtershow.filters.FilterDrawRepresentation.StrokeData; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.pipeline.FilterEnvironment; import java.util.Vector; @@ -147,7 +147,7 @@ public class ImageFilterDraw extends ImageFilter { if (mBrush == null) { BitmapFactory.Options opt = new BitmapFactory.Options(); opt.inPreferredConfig = Bitmap.Config.ALPHA_8; - mBrush = BitmapFactory.decodeResource(MasterImage.getImage().getActivity() + mBrush = BitmapFactory.decodeResource(PrimaryImage.getImage().getActivity() .getResources(), mBrushID, opt); mBrush = mBrush.extractAlpha(); } diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java index 6cc49705f..e1add01e3 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java @@ -25,7 +25,7 @@ import com.adobe.xmp.XMPMeta; import com.android.gallery3d.app.Log; import com.android.gallery3d.filtershow.cache.BitmapCache; import com.android.gallery3d.filtershow.cache.ImageLoader; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.pipeline.ImagePreset; /** @@ -80,7 +80,7 @@ public class ImageFilterTinyPlanet extends SimpleImageFilter { ImagePreset preset = getEnvironment().getImagePreset(); Bitmap mBitmapOut = null; if (preset != null) { - XMPMeta xmp = ImageLoader.getXmpObject(MasterImage.getImage().getActivity()); + XMPMeta xmp = ImageLoader.getXmpObject(PrimaryImage.getImage().getActivity()); // Do nothing, just use bitmapIn as is if we don't have XMP. if(xmp != null) { bitmapIn = applyXmp(bitmapIn, xmp, w); diff --git a/src/com/android/gallery3d/filtershow/imageshow/GeometryMathUtils.java b/src/com/android/gallery3d/filtershow/imageshow/GeometryMathUtils.java index 614b6485d..af2b7f3f5 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/GeometryMathUtils.java +++ b/src/com/android/gallery3d/filtershow/imageshow/GeometryMathUtils.java @@ -293,7 +293,7 @@ public final class GeometryMathUtils { public static void initializeHolder(GeometryHolder outHolder, FilterRepresentation currentLocal) { - Collection<FilterRepresentation> geometry = MasterImage.getImage().getPreset() + Collection<FilterRepresentation> geometry = PrimaryImage.getImage().getPreset() .getGeometryFilters(); replaceInstances(geometry, currentLocal); unpackGeometry(outHolder, geometry); @@ -316,7 +316,7 @@ public final class GeometryMathUtils { crop.roundOut(frame); Matrix m = getCropSelectionToScreenMatrix(null, holder, width, height, frame.width(), frame.height()); - BitmapCache bitmapCache = MasterImage.getImage().getBitmapCache(); + BitmapCache bitmapCache = PrimaryImage.getImage().getBitmapCache(); Bitmap temp = bitmapCache.getBitmap(frame.width(), frame.height(), BitmapCache.UTIL_GEOMETRY); Canvas canvas = new Canvas(temp); @@ -372,7 +372,7 @@ public final class GeometryMathUtils { public static Matrix getOriginalToScreen(GeometryHolder holder, boolean rotate, float originalWidth, float originalHeight, float viewWidth, float viewHeight) { - int orientation = MasterImage.getImage().getZoomOrientation(); + int orientation = PrimaryImage.getImage().getZoomOrientation(); int rotation = getRotationForOrientation(orientation); Rotation prev = holder.rotation; rotation = (rotation + prev.value()) % 360; @@ -391,7 +391,7 @@ public final class GeometryMathUtils { if (!holder.isNil()) { bmap = applyFullGeometryMatrix(bmap, holder); if (bmap != image) { - BitmapCache cache = MasterImage.getImage().getBitmapCache(); + BitmapCache cache = PrimaryImage.getImage().getBitmapCache(); cache.cache(image); } } diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java index 4e53f8247..0f2095f3f 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java @@ -228,8 +228,8 @@ public class ImageCrop extends ImageShow { } private void forceStateConsistency() { - MasterImage master = MasterImage.getImage(); - Bitmap image = master.getFiltersOnlyImage(); + PrimaryImage primary = PrimaryImage.getImage(); + Bitmap image = primary.getFiltersOnlyImage(); int width = image.getWidth(); int height = image.getHeight(); if (mCropObj == null || !mUpdateHolder.equals(mGeometry) @@ -254,9 +254,9 @@ public class ImageCrop extends ImageShow { @Override public void onDraw(Canvas canvas) { - Bitmap bitmap = MasterImage.getImage().getFiltersOnlyImage(); + Bitmap bitmap = PrimaryImage.getImage().getFiltersOnlyImage(); if (bitmap == null) { - MasterImage.getImage().invalidateFiltersOnly(); + PrimaryImage.getImage().invalidateFiltersOnly(); } if (!mValidDraw || bitmap == null) { return; diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageMirror.java b/src/com/android/gallery3d/filtershow/imageshow/ImageMirror.java index 26c49b1a8..b0c083118 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageMirror.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageMirror.java @@ -61,8 +61,8 @@ public class ImageMirror extends ImageShow { @Override public void onDraw(Canvas canvas) { - MasterImage master = MasterImage.getImage(); - Bitmap image = master.getFiltersOnlyImage(); + PrimaryImage primary = PrimaryImage.getImage(); + Bitmap image = primary.getFiltersOnlyImage(); if (image == null) { return; } diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java b/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java index 5186c09d7..77e8de777 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java @@ -65,8 +65,8 @@ public class ImageRotate extends ImageShow { @Override public void onDraw(Canvas canvas) { - MasterImage master = MasterImage.getImage(); - Bitmap image = master.getFiltersOnlyImage(); + PrimaryImage primary = PrimaryImage.getImage(); + Bitmap image = primary.getFiltersOnlyImage(); if (image == null) { return; } diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java index e2f21f326..04dab73a2 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java @@ -32,7 +32,6 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Shader; import android.graphics.drawable.NinePatchDrawable; -import androidx.core.widget.EdgeEffectCompat; import android.util.AttributeSet; import android.util.Log; import android.view.GestureDetector; @@ -42,6 +41,7 @@ import android.view.MotionEvent; import android.view.ScaleGestureDetector; import android.view.View; import android.widget.LinearLayout; +import androidx.core.widget.EdgeEffectCompat; import com.android.gallery3d.R; import com.android.gallery3d.filtershow.FilterShowActivity; @@ -140,7 +140,7 @@ public class ImageShow extends View implements OnGestureListener, } public boolean hasModifications() { - return MasterImage.getImage().hasModifications(); + return PrimaryImage.getImage().hasModifications(); } public void resetParameter() { @@ -187,13 +187,13 @@ public class ImageShow extends View implements OnGestureListener, } public void attach() { - MasterImage.getImage().addObserver(this); + PrimaryImage.getImage().addObserver(this); bindAsImageLoadListener(); - MasterImage.getImage().resetGeometryImages(false); + PrimaryImage.getImage().resetGeometryImages(false); } public void detach() { - MasterImage.getImage().removeObserver(this); + PrimaryImage.getImage().removeObserver(this); mMaskPaint.reset(); } @@ -210,7 +210,7 @@ public class ImageShow extends View implements OnGestureListener, } public ImageFilter getCurrentFilter() { - return MasterImage.getImage().getCurrentFilter(); + return PrimaryImage.getImage().getCurrentFilter(); } /* consider moving the following 2 methods into a subclass */ @@ -221,14 +221,15 @@ public class ImageShow extends View implements OnGestureListener, * @return Image to Screen transformation matrix */ protected Matrix getImageToScreenMatrix(boolean reflectRotation) { - MasterImage master = MasterImage.getImage(); - if (master.getOriginalBounds() == null) { + PrimaryImage primary = PrimaryImage.getImage(); + if (primary.getOriginalBounds() == null) { return new Matrix(); } - Matrix m = GeometryMathUtils.getImageToScreenMatrix(master.getPreset().getGeometryFilters(), - reflectRotation, master.getOriginalBounds(), getWidth(), getHeight()); - Point translate = master.getTranslation(); - float scaleFactor = master.getScaleFactor(); + Matrix m = GeometryMathUtils.getImageToScreenMatrix( + primary.getPreset().getGeometryFilters(), reflectRotation, + primary.getOriginalBounds(), getWidth(), getHeight()); + Point translate = primary.getTranslation(); + float scaleFactor = primary.getScaleFactor(); m.postTranslate(translate.x, translate.y); m.postScale(scaleFactor, scaleFactor, getWidth() / 2.0f, getHeight() / 2.0f); return m; @@ -248,7 +249,7 @@ public class ImageShow extends View implements OnGestureListener, } public ImagePreset getImagePreset() { - return MasterImage.getImage().getPreset(); + return PrimaryImage.getImage().getPreset(); } @Override @@ -256,11 +257,11 @@ public class ImageShow extends View implements OnGestureListener, mPaint.reset(); mPaint.setAntiAlias(true); mPaint.setFilterBitmap(true); - MasterImage.getImage().setImageShowSize( + PrimaryImage.getImage().setImageShowSize( getWidth() - 2*mShadowMargin, getHeight() - 2*mShadowMargin); - MasterImage img = MasterImage.getImage(); + PrimaryImage img = PrimaryImage.getImage(); // Hide the loading indicator as needed if (mActivity.isLoadingVisible() && getFilteredImage() != null) { if ((img.getLoadedPreset() == null) @@ -277,10 +278,10 @@ public class ImageShow extends View implements OnGestureListener, mShadowDrawn = false; - Bitmap highresPreview = MasterImage.getImage().getHighresImage(); - Bitmap fullHighres = MasterImage.getImage().getPartialImage(); + Bitmap highresPreview = PrimaryImage.getImage().getHighresImage(); + Bitmap fullHighres = PrimaryImage.getImage().getPartialImage(); - boolean isDoingNewLookAnimation = MasterImage.getImage().onGoingNewLookAnimation(); + boolean isDoingNewLookAnimation = PrimaryImage.getImage().onGoingNewLookAnimation(); if (highresPreview == null || isDoingNewLookAnimation) { drawImageAndAnimate(canvas, getFilteredImage()); @@ -319,12 +320,12 @@ public class ImageShow extends View implements OnGestureListener, } private void drawHighresImage(Canvas canvas, Bitmap fullHighres) { - Matrix originalToScreen = MasterImage.getImage().originalImageToScreen(); + Matrix originalToScreen = PrimaryImage.getImage().originalImageToScreen(); if (fullHighres != null && originalToScreen != null) { Matrix screenToOriginal = new Matrix(); originalToScreen.invert(screenToOriginal); Rect rBounds = new Rect(); - rBounds.set(MasterImage.getImage().getPartialBounds()); + rBounds.set(PrimaryImage.getImage().getPartialBounds()); if (fullHighres != null) { originalToScreen.preTranslate(rBounds.left, rBounds.top); canvas.clipRect(mImageBounds); @@ -334,19 +335,19 @@ public class ImageShow extends View implements OnGestureListener, } public void resetImageCaches(ImageShow caller) { - MasterImage.getImage().invalidatePreview(); + PrimaryImage.getImage().invalidatePreview(); } public Bitmap getFiltersOnlyImage() { - return MasterImage.getImage().getFiltersOnlyImage(); + return PrimaryImage.getImage().getFiltersOnlyImage(); } public Bitmap getGeometryOnlyImage() { - return MasterImage.getImage().getGeometryOnlyImage(); + return PrimaryImage.getImage().getGeometryOnlyImage(); } public Bitmap getFilteredImage() { - return MasterImage.getImage().getFilteredImage(); + return PrimaryImage.getImage().getFilteredImage(); } public void drawImageAndAnimate(Canvas canvas, @@ -354,8 +355,8 @@ public class ImageShow extends View implements OnGestureListener, if (image == null) { return; } - MasterImage master = MasterImage.getImage(); - Matrix m = master.computeImageToScreen(image, 0, false); + PrimaryImage primary = PrimaryImage.getImage(); + Matrix m = primary.computeImageToScreen(image, 0, false); if (m == null) { return; } @@ -366,13 +367,13 @@ public class ImageShow extends View implements OnGestureListener, m.mapRect(d); d.roundOut(mImageBounds); - boolean showAnimatedImage = master.onGoingNewLookAnimation(); + boolean showAnimatedImage = primary.onGoingNewLookAnimation(); if (!showAnimatedImage && mDidStartAnimation) { // animation ended, but do we have the correct image to show? - if (master.getPreset().equals(master.getCurrentPreset())) { + if (primary.getPreset().equals(primary.getCurrentPreset())) { // we do, let's stop showing the animated image mDidStartAnimation = false; - MasterImage.getImage().resetAnimBitmap(); + PrimaryImage.getImage().resetAnimBitmap(); } else { showAnimatedImage = true; } @@ -384,8 +385,8 @@ public class ImageShow extends View implements OnGestureListener, canvas.save(); // Animation uses the image before the change - Bitmap previousImage = master.getPreviousImage(); - Matrix mp = master.computeImageToScreen(previousImage, 0, false); + Bitmap previousImage = primary.getPreviousImage(); + Matrix mp = primary.computeImageToScreen(previousImage, 0, false); RectF dp = new RectF(0, 0, previousImage.getWidth(), previousImage.getHeight()); mp.mapRect(dp); Rect previousBounds = new Rect(); @@ -394,9 +395,9 @@ public class ImageShow extends View implements OnGestureListener, float centerY = dp.centerY(); boolean needsToDrawImage = true; - if (master.getCurrentLookAnimation() - == MasterImage.CIRCLE_ANIMATION) { - float maskScale = MasterImage.getImage().getMaskScale(); + if (primary.getCurrentLookAnimation() + == PrimaryImage.CIRCLE_ANIMATION) { + float maskScale = PrimaryImage.getImage().getMaskScale(); if (maskScale >= 0.0f) { float maskW = sMask.getWidth() / 2.0f; float maskH = sMask.getHeight() / 2.0f; @@ -427,25 +428,25 @@ public class ImageShow extends View implements OnGestureListener, canvas.drawBitmap(sMask, 0, 0, mMaskPaint); needsToDrawImage = false; } - } else if (master.getCurrentLookAnimation() - == MasterImage.ROTATE_ANIMATION) { - Rect d1 = computeImageBounds(master.getPreviousImage().getHeight(), - master.getPreviousImage().getWidth()); - Rect d2 = computeImageBounds(master.getPreviousImage().getWidth(), - master.getPreviousImage().getHeight()); + } else if (primary.getCurrentLookAnimation() + == PrimaryImage.ROTATE_ANIMATION) { + Rect d1 = computeImageBounds(primary.getPreviousImage().getHeight(), + primary.getPreviousImage().getWidth()); + Rect d2 = computeImageBounds(primary.getPreviousImage().getWidth(), + primary.getPreviousImage().getHeight()); float finalScale = d1.width() / (float) d2.height(); - finalScale = (1.0f * (1.0f - master.getAnimFraction())) - + (finalScale * master.getAnimFraction()); - canvas.rotate(master.getAnimRotationValue(), centerX, centerY); + finalScale = (1.0f * (1.0f - primary.getAnimFraction())) + + (finalScale * primary.getAnimFraction()); + canvas.rotate(primary.getAnimRotationValue(), centerX, centerY); canvas.scale(finalScale, finalScale, centerX, centerY); - } else if (master.getCurrentLookAnimation() - == MasterImage.MIRROR_ANIMATION) { - if (master.getCurrentFilterRepresentation() + } else if (primary.getCurrentLookAnimation() + == PrimaryImage.MIRROR_ANIMATION) { + if (primary.getCurrentFilterRepresentation() instanceof FilterMirrorRepresentation) { FilterMirrorRepresentation rep = - (FilterMirrorRepresentation) master.getCurrentFilterRepresentation(); + (FilterMirrorRepresentation) primary.getCurrentFilterRepresentation(); - ImagePreset preset = master.getPreset(); + ImagePreset preset = primary.getPreset(); ArrayList<FilterRepresentation> geometry = (ArrayList<FilterRepresentation>) preset.getGeometryFilters(); GeometryMathUtils.GeometryHolder holder = null; @@ -453,23 +454,23 @@ public class ImageShow extends View implements OnGestureListener, if (holder.rotation.value() == 90 || holder.rotation.value() == 270) { if (rep.isHorizontal() && !rep.isVertical()) { - canvas.scale(1, master.getAnimRotationValue(), centerX, centerY); + canvas.scale(1, primary.getAnimRotationValue(), centerX, centerY); } else if (rep.isVertical() && !rep.isHorizontal()) { - canvas.scale(1, master.getAnimRotationValue(), centerX, centerY); + canvas.scale(1, primary.getAnimRotationValue(), centerX, centerY); } else if (rep.isHorizontal() && rep.isVertical()) { - canvas.scale(master.getAnimRotationValue(), 1, centerX, centerY); + canvas.scale(primary.getAnimRotationValue(), 1, centerX, centerY); } else { - canvas.scale(master.getAnimRotationValue(), 1, centerX, centerY); + canvas.scale(primary.getAnimRotationValue(), 1, centerX, centerY); } } else { if (rep.isHorizontal() && !rep.isVertical()) { - canvas.scale(master.getAnimRotationValue(), 1, centerX, centerY); + canvas.scale(primary.getAnimRotationValue(), 1, centerX, centerY); } else if (rep.isVertical() && !rep.isHorizontal()) { - canvas.scale(master.getAnimRotationValue(), 1, centerX, centerY); + canvas.scale(primary.getAnimRotationValue(), 1, centerX, centerY); } else if (rep.isHorizontal() && rep.isVertical()) { - canvas.scale(1, master.getAnimRotationValue(), centerX, centerY); + canvas.scale(1, primary.getAnimRotationValue(), centerX, centerY); } else { - canvas.scale(1, master.getAnimRotationValue(), centerX, centerY); + canvas.scale(1, primary.getAnimRotationValue(), centerX, centerY); } } } @@ -514,8 +515,8 @@ public class ImageShow extends View implements OnGestureListener, } public void drawCompareImage(Canvas canvas, Bitmap image) { - MasterImage master = MasterImage.getImage(); - boolean showsOriginal = master.showsOriginal(); + PrimaryImage primary = PrimaryImage.getImage(); + boolean showsOriginal = primary.showsOriginal(); if (!showsOriginal && !mTouchShowOriginal) return; canvas.save(); @@ -555,7 +556,7 @@ public class ImageShow extends View implements OnGestureListener, } } canvas.clipRect(d); - Matrix m = master.computeImageToScreen(image, 0, false); + Matrix m = primary.computeImageToScreen(image, 0, false); canvas.drawBitmap(image, m, mPaint); Paint paint = new Paint(); paint.setColor(Color.BLACK); @@ -588,7 +589,7 @@ public class ImageShow extends View implements OnGestureListener, } public void bindAsImageLoadListener() { - MasterImage.getImage().addListener(this); + PrimaryImage.getImage().addListener(this); } public void updateImage() { @@ -634,22 +635,23 @@ public class ImageShow extends View implements OnGestureListener, mTouchDown.y = ey; mTouchShowOriginalDate = System.currentTimeMillis(); mShowOriginalDirection = 0; - MasterImage.getImage().setOriginalTranslation(MasterImage.getImage().getTranslation()); + PrimaryImage.getImage().setOriginalTranslation( + PrimaryImage.getImage().getTranslation()); } if (action == MotionEvent.ACTION_MOVE && mInteractionMode == InteractionMode.MOVE) { mTouch.x = ex; mTouch.y = ey; - float scaleFactor = MasterImage.getImage().getScaleFactor(); + float scaleFactor = PrimaryImage.getImage().getScaleFactor(); if (scaleFactor > 1 && (!ENABLE_ZOOMED_COMPARISON || event.getPointerCount() == 2)) { float translateX = (mTouch.x - mTouchDown.x) / scaleFactor; float translateY = (mTouch.y - mTouchDown.y) / scaleFactor; - Point originalTranslation = MasterImage.getImage().getOriginalTranslation(); - Point translation = MasterImage.getImage().getTranslation(); + Point originalTranslation = PrimaryImage.getImage().getOriginalTranslation(); + Point translation = PrimaryImage.getImage().getTranslation(); translation.x = (int) (originalTranslation.x + translateX); translation.y = (int) (originalTranslation.y + translateY); - MasterImage.getImage().setTranslation(translation); + PrimaryImage.getImage().setTranslation(translation); mTouchShowOriginal = false; } else if (enableComparison() && !mOriginalDisabled && (System.currentTimeMillis() - mTouchShowOriginalDate @@ -668,16 +670,16 @@ public class ImageShow extends View implements OnGestureListener, mTouchDown.y = 0; mTouch.x = 0; mTouch.y = 0; - if (MasterImage.getImage().getScaleFactor() <= 1) { - MasterImage.getImage().setScaleFactor(1); - MasterImage.getImage().resetTranslation(); + if (PrimaryImage.getImage().getScaleFactor() <= 1) { + PrimaryImage.getImage().setScaleFactor(1); + PrimaryImage.getImage().resetTranslation(); } } - float scaleFactor = MasterImage.getImage().getScaleFactor(); - Point translation = MasterImage.getImage().getTranslation(); + float scaleFactor = PrimaryImage.getImage().getScaleFactor(); + Point translation = PrimaryImage.getImage().getTranslation(); constrainTranslation(translation, scaleFactor); - MasterImage.getImage().setTranslation(translation); + PrimaryImage.getImage().setTranslation(translation); invalidate(); return true; @@ -701,18 +703,18 @@ public class ImageShow extends View implements OnGestureListener, mAnimatorTranslateX.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { @Override public void onAnimationUpdate(ValueAnimator animation) { - Point translation = MasterImage.getImage().getTranslation(); + Point translation = PrimaryImage.getImage().getTranslation(); translation.x = (Integer) animation.getAnimatedValue(); - MasterImage.getImage().setTranslation(translation); + PrimaryImage.getImage().setTranslation(translation); invalidate(); } }); mAnimatorTranslateY.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { @Override public void onAnimationUpdate(ValueAnimator animation) { - Point translation = MasterImage.getImage().getTranslation(); + Point translation = PrimaryImage.getImage().getTranslation(); translation.y = (Integer) animation.getAnimatedValue(); - MasterImage.getImage().setTranslation(translation); + PrimaryImage.getImage().setTranslation(translation); invalidate(); } }); @@ -721,8 +723,8 @@ public class ImageShow extends View implements OnGestureListener, } private void applyTranslationConstraints() { - float scaleFactor = MasterImage.getImage().getScaleFactor(); - Point translation = MasterImage.getImage().getTranslation(); + float scaleFactor = PrimaryImage.getImage().getScaleFactor(); + Point translation = PrimaryImage.getImage().getTranslation(); int x = translation.x; int y = translation.y; constrainTranslation(translation, scaleFactor); @@ -745,19 +747,19 @@ public class ImageShow extends View implements OnGestureListener, final float x = arg0.getX(); final float y = arg0.getY(); if (mZoomIn) { - scale = MasterImage.getImage().getMaxScaleFactor(); + scale = PrimaryImage.getImage().getMaxScaleFactor(); } - if (scale != MasterImage.getImage().getScaleFactor()) { + if (scale != PrimaryImage.getImage().getScaleFactor()) { if (mAnimatorScale != null) { mAnimatorScale.cancel(); } mAnimatorScale = ValueAnimator.ofFloat( - MasterImage.getImage().getScaleFactor(), + PrimaryImage.getImage().getScaleFactor(), scale ); float translateX = (getWidth() / 2 - x); float translateY = (getHeight() / 2 - y); - Point translation = MasterImage.getImage().getTranslation(); + Point translation = PrimaryImage.getImage().getTranslation(); int startTranslateX = translation.x; int startTranslateY = translation.y; if (scale != 1.0f) { @@ -776,7 +778,7 @@ public class ImageShow extends View implements OnGestureListener, mAnimatorScale.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { @Override public void onAnimationUpdate(ValueAnimator animation) { - MasterImage.getImage().setScaleFactor((Float) animation.getAnimatedValue()); + PrimaryImage.getImage().setScaleFactor((Float) animation.getAnimatedValue()); invalidate(); } }); @@ -788,7 +790,7 @@ public class ImageShow extends View implements OnGestureListener, @Override public void onAnimationEnd(Animator animation) { applyTranslationConstraints(); - MasterImage.getImage().needsUpdatePartialPreview(); + PrimaryImage.getImage().needsUpdatePartialPreview(); invalidate(); } @@ -815,8 +817,8 @@ public class ImageShow extends View implements OnGestureListener, return; } - Matrix originalToScreen = MasterImage.getImage().originalImageToScreen(); - Rect originalBounds = MasterImage.getImage().getOriginalBounds(); + Matrix originalToScreen = PrimaryImage.getImage().originalImageToScreen(); + Rect originalBounds = PrimaryImage.getImage().getOriginalBounds(); RectF screenPos = new RectF(originalBounds); originalToScreen.mapRect(screenPos); @@ -922,36 +924,36 @@ public class ImageShow extends View implements OnGestureListener, @Override public boolean onScale(ScaleGestureDetector detector) { - MasterImage img = MasterImage.getImage(); + PrimaryImage img = PrimaryImage.getImage(); float scaleFactor = img.getScaleFactor(); scaleFactor = scaleFactor * detector.getScaleFactor(); - if (scaleFactor > MasterImage.getImage().getMaxScaleFactor()) { - scaleFactor = MasterImage.getImage().getMaxScaleFactor(); + if (scaleFactor > PrimaryImage.getImage().getMaxScaleFactor()) { + scaleFactor = PrimaryImage.getImage().getMaxScaleFactor(); } if (scaleFactor < 1.0f) { scaleFactor = 1.0f; } - MasterImage.getImage().setScaleFactor(scaleFactor); + PrimaryImage.getImage().setScaleFactor(scaleFactor); scaleFactor = img.getScaleFactor(); float focusx = detector.getFocusX(); float focusy = detector.getFocusY(); float translateX = (focusx - mStartFocusX) / scaleFactor; float translateY = (focusy - mStartFocusY) / scaleFactor; - Point translation = MasterImage.getImage().getTranslation(); + Point translation = PrimaryImage.getImage().getTranslation(); translation.x = (int) (mOriginalTranslation.x + translateX); translation.y = (int) (mOriginalTranslation.y + translateY); - MasterImage.getImage().setTranslation(translation); + PrimaryImage.getImage().setTranslation(translation); invalidate(); return true; } @Override public boolean onScaleBegin(ScaleGestureDetector detector) { - Point pos = MasterImage.getImage().getTranslation(); + Point pos = PrimaryImage.getImage().getTranslation(); mOriginalTranslation.x = pos.x; mOriginalTranslation.y = pos.y; - mOriginalScale = MasterImage.getImage().getScaleFactor(); + mOriginalScale = PrimaryImage.getImage().getScaleFactor(); mStartFocusX = detector.getFocusX(); mStartFocusY = detector.getFocusY(); mInteractionMode = InteractionMode.SCALE; @@ -961,8 +963,8 @@ public class ImageShow extends View implements OnGestureListener, @Override public void onScaleEnd(ScaleGestureDetector detector) { mInteractionMode = InteractionMode.NONE; - if (MasterImage.getImage().getScaleFactor() < 1) { - MasterImage.getImage().setScaleFactor(1); + if (PrimaryImage.getImage().getScaleFactor() < 1) { + PrimaryImage.getImage().setScaleFactor(1); invalidate(); } } diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java index 4742f2ecf..88f9b4857 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java @@ -240,10 +240,10 @@ public class ImageStraighten extends ImageShow { @Override public void onDraw(Canvas canvas) { - MasterImage master = MasterImage.getImage(); - Bitmap image = master.getFiltersOnlyImage(); + PrimaryImage primary = PrimaryImage.getImage(); + Bitmap image = primary.getFiltersOnlyImage(); if (image == null) { - MasterImage.getImage().invalidateFiltersOnly(); + PrimaryImage.getImage().invalidateFiltersOnly(); return; } GeometryMathUtils.initializeHolder(mDrawHolder, mLocalRep); diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java b/src/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java index 25a0a9073..c89509935 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java @@ -140,9 +140,9 @@ public class ImageTinyPlanet extends ImageShow { @Override public void onDraw(Canvas canvas) { - Bitmap bitmap = MasterImage.getImage().getHighresImage(); + Bitmap bitmap = PrimaryImage.getImage().getHighresImage(); if (bitmap == null) { - bitmap = MasterImage.getImage().getFilteredImage(); + bitmap = PrimaryImage.getImage().getFilteredImage(); } if (bitmap != null) { diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/PrimaryImage.java index f6b97f11f..63e683a1d 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java +++ b/src/com/android/gallery3d/filtershow/imageshow/PrimaryImage.java @@ -48,14 +48,14 @@ import com.android.gallery3d.filtershow.state.StateAdapter; import java.util.List; import java.util.Vector; -public class MasterImage implements RenderingRequestCaller { +public class PrimaryImage implements RenderingRequestCaller { - private static final String LOGTAG = "MasterImage"; + private static final String LOGTAG = "PrimaryImage"; private boolean DEBUG = false; private static final boolean DISABLEZOOM = false; public static final int SMALL_BITMAP_DIM = 160; public static final int MAX_BITMAP_DIM = 900; - private static MasterImage sMasterImage = null; + private static PrimaryImage sPrimaryImage = null; private boolean mSupportsHighRes = false; @@ -116,19 +116,19 @@ public class MasterImage implements RenderingRequestCaller { private List<ExifTag> mEXIF; private BitmapCache mBitmapCache = new BitmapCache(); - private MasterImage() { + private PrimaryImage() { } // TODO: remove singleton - public static void setMaster(MasterImage master) { - sMasterImage = master; + public static void setPrimary(PrimaryImage primary) { + sPrimaryImage = primary; } - public static MasterImage getImage() { - if (sMasterImage == null) { - sMasterImage = new MasterImage(); + public static PrimaryImage getImage() { + if (sPrimaryImage == null) { + sPrimaryImage = new PrimaryImage(); } - return sMasterImage; + return sPrimaryImage; } public Bitmap getOriginalBitmapSmall() { @@ -664,7 +664,7 @@ public class MasterImage implements RenderingRequestCaller { invalidatePartialPreview(); return; } - Matrix originalToScreen = MasterImage.getImage().originalImageToScreen(); + Matrix originalToScreen = PrimaryImage.getImage().originalImageToScreen(); if (originalToScreen == null) { return; } @@ -721,7 +721,7 @@ public class MasterImage implements RenderingRequestCaller { } public static void reset() { - sMasterImage = null; + sPrimaryImage = null; } public float getScaleFactor() { diff --git a/src/com/android/gallery3d/filtershow/info/InfoPanel.java b/src/com/android/gallery3d/filtershow/info/InfoPanel.java index 1d8751de9..3fc75b748 100644 --- a/src/com/android/gallery3d/filtershow/info/InfoPanel.java +++ b/src/com/android/gallery3d/filtershow/info/InfoPanel.java @@ -34,7 +34,7 @@ import com.android.gallery3d.R; import com.android.gallery3d.exif.ExifInterface; import com.android.gallery3d.exif.ExifTag; import com.android.gallery3d.filtershow.cache.ImageLoader; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import java.util.List; @@ -70,7 +70,7 @@ public class InfoPanel extends DialogFragment { R.layout.filtershow_info_panel, null, false); mImageThumbnail = (ImageView) mMainView.findViewById(R.id.imageThumbnail); - Bitmap bitmap = MasterImage.getImage().getFilteredImage(); + Bitmap bitmap = PrimaryImage.getImage().getFilteredImage(); mImageThumbnail.setImageBitmap(bitmap); mImageName = (TextView) mMainView.findViewById(R.id.imageName); @@ -81,7 +81,7 @@ public class InfoPanel extends DialogFragment { HistogramView histogramView = (HistogramView) mMainView.findViewById(R.id.histogramView); histogramView.setBitmap(bitmap); - Uri uri = MasterImage.getImage().getUri(); + Uri uri = PrimaryImage.getImage().getUri(); String path = ImageLoader.getLocalPathFromUri(getActivity(), uri); Uri localUri = null; if (path != null) { @@ -91,10 +91,10 @@ public class InfoPanel extends DialogFragment { if (localUri != null) { mImageName.setText(localUri.getLastPathSegment()); } - Rect originalBounds = MasterImage.getImage().getOriginalBounds(); + Rect originalBounds = PrimaryImage.getImage().getOriginalBounds(); mImageSize.setText("" + originalBounds.width() + " x " + originalBounds.height()); - List<ExifTag> exif = MasterImage.getImage().getEXIF(); + List<ExifTag> exif = PrimaryImage.getImage().getEXIF(); String exifString = ""; boolean hasExifData = false; if (exif != null) { diff --git a/src/com/android/gallery3d/filtershow/pipeline/Buffer.java b/src/com/android/gallery3d/filtershow/pipeline/Buffer.java index a487a5d8d..30b2d2c72 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/Buffer.java +++ b/src/com/android/gallery3d/filtershow/pipeline/Buffer.java @@ -22,7 +22,7 @@ import android.renderscript.Allocation; import android.renderscript.RenderScript; import android.util.Log; import com.android.gallery3d.filtershow.cache.BitmapCache; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; public class Buffer { private static final String LOGTAG = "Buffer"; @@ -34,7 +34,7 @@ public class Buffer { public Buffer(Bitmap bitmap) { RenderScript rs = CachingPipeline.getRenderScriptContext(); if (bitmap != null) { - BitmapCache cache = MasterImage.getImage().getBitmapCache(); + BitmapCache cache = PrimaryImage.getImage().getBitmapCache(); mBitmap = cache.getBitmapCopy(bitmap, BitmapCache.PREVIEW_CACHE); } if (mUseAllocation) { @@ -88,10 +88,9 @@ public class Buffer { } public void remove() { - BitmapCache cache = MasterImage.getImage().getBitmapCache(); + BitmapCache cache = PrimaryImage.getImage().getBitmapCache(); if (cache.cache(mBitmap)) { mBitmap = null; } } } - diff --git a/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java b/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java index 2923e3bbb..94ca3afda 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java +++ b/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java @@ -33,7 +33,7 @@ import com.android.gallery3d.filtershow.cache.ImageLoader; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.filters.FiltersManager; import com.android.gallery3d.filtershow.imageshow.GeometryMathUtils; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import java.util.Vector; @@ -163,7 +163,7 @@ public class CachingPipeline implements PipelineInterface { private void setupEnvironment(ImagePreset preset, boolean highResPreview) { mEnvironment.setPipeline(this); mEnvironment.setFiltersManager(mFiltersManager); - mEnvironment.setBitmapCache(MasterImage.getImage().getBitmapCache()); + mEnvironment.setBitmapCache(PrimaryImage.getImage().getBitmapCache()); if (highResPreview) { mEnvironment.setScaleFactor(mHighResPreviewScaleFactor); } else { @@ -177,7 +177,7 @@ public class CachingPipeline implements PipelineInterface { public void setOriginal(Bitmap bitmap) { mOriginalBitmap = bitmap; Log.v(LOGTAG,"setOriginal, size " + bitmap.getWidth() + " x " + bitmap.getHeight()); - ImagePreset preset = MasterImage.getImage().getPreset(); + ImagePreset preset = PrimaryImage.getImage().getPreset(); setupEnvironment(preset, false); updateOriginalAllocation(preset); } @@ -219,7 +219,7 @@ public class CachingPipeline implements PipelineInterface { } ImagePreset preset = request.getImagePreset(); setupEnvironment(preset, false); - Bitmap bitmap = MasterImage.getImage().getOriginalBitmapHighres(); + Bitmap bitmap = PrimaryImage.getImage().getOriginalBitmapHighres(); if (bitmap == null) { return; } @@ -244,7 +244,7 @@ public class CachingPipeline implements PipelineInterface { } ImagePreset preset = request.getImagePreset(); setupEnvironment(preset, false); - Bitmap bitmap = MasterImage.getImage().getOriginalBitmapHighres(); + Bitmap bitmap = PrimaryImage.getImage().getOriginalBitmapHighres(); if (bitmap == null) { return; } @@ -266,7 +266,7 @@ public class CachingPipeline implements PipelineInterface { } ImagePreset preset = request.getImagePreset(); setupEnvironment(preset, false); - Bitmap bitmap = MasterImage.getImage().getOriginalBitmapHighres(); + Bitmap bitmap = PrimaryImage.getImage().getOriginalBitmapHighres(); if (bitmap == null) { return; } @@ -304,10 +304,10 @@ public class CachingPipeline implements PipelineInterface { mFiltersManager.freeFilterResources(preset); if (request.getType() == RenderingRequest.PARTIAL_RENDERING) { - MasterImage master = MasterImage.getImage(); - bitmap = ImageLoader.getScaleOneImageForPreset(master.getActivity(), + PrimaryImage primary = PrimaryImage.getImage(); + bitmap = ImageLoader.getScaleOneImageForPreset(primary.getActivity(), mEnvironment.getBimapCache(), - master.getUri(), request.getBounds(), + primary.getUri(), request.getBounds(), request.getDestination()); if (bitmap == null) { Log.w(LOGTAG, "could not get bitmap for: " + getType(request)); @@ -322,8 +322,9 @@ public class CachingPipeline implements PipelineInterface { } if (DEBUG && bitmap != null) { - Log.v(LOGTAG, "after update, req bitmap (" + bitmap.getWidth() + "x" + bitmap.getHeight() - + " ? resizeOriginal (" + mResizedOriginalBitmap.getWidth() + "x" + Log.v(LOGTAG, "after update, req bitmap (" + bitmap.getWidth() + "x" + + bitmap.getHeight() + " ? resizeOriginal (" + + mResizedOriginalBitmap.getWidth() + "x" + mResizedOriginalBitmap.getHeight()); } @@ -348,9 +349,9 @@ public class CachingPipeline implements PipelineInterface { if (request.getType() == RenderingRequest.ICON_RENDERING) { Rect iconBounds = request.getIconBounds(); - Bitmap source = MasterImage.getImage().getThumbnailBitmap(); + Bitmap source = PrimaryImage.getImage().getThumbnailBitmap(); if (iconBounds.width() > source.getWidth() * 2) { - source = MasterImage.getImage().getLargeThumbnailBitmap(); + source = PrimaryImage.getImage().getLargeThumbnailBitmap(); } if (iconBounds != null) { bitmap = mEnvironment.getBitmap(iconBounds.width(), @@ -425,7 +426,7 @@ public class CachingPipeline implements PipelineInterface { } public boolean needsRepaint() { - SharedBuffer buffer = MasterImage.getImage().getPreviewBuffer(); + SharedBuffer buffer = PrimaryImage.getImage().getPreviewBuffer(); return buffer.checkRepaintNeeded(); } diff --git a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java index 9166ee3be..8ad825d63 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java @@ -38,7 +38,7 @@ import com.android.gallery3d.filtershow.filters.FilterUserPresetRepresentation; import com.android.gallery3d.filtershow.filters.FiltersManager; import com.android.gallery3d.filtershow.filters.ImageFilter; import com.android.gallery3d.filtershow.imageshow.GeometryMathUtils; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.state.State; import com.android.gallery3d.filtershow.state.StateAdapter; @@ -571,7 +571,7 @@ public class ImagePreset { } public boolean canDoPartialRendering() { - if (MasterImage.getImage().getZoomOrientation() != ImageLoader.ORI_NORMAL) { + if (PrimaryImage.getImage().getZoomOrientation() != ImageLoader.ORI_NORMAL) { return false; } for (int i = 0; i < mFilters.size(); i++) { diff --git a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java index 6c6c2d9a2..c0b7536fa 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java +++ b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java @@ -32,7 +32,7 @@ import com.android.gallery3d.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.filters.FiltersManager; import com.android.gallery3d.filtershow.filters.ImageFilter; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.tools.SaveImage; import java.io.File; @@ -214,7 +214,7 @@ public class ProcessingService extends Service { mNeedsAlive = false; mSaving = true; handleSaveRequest(sourceUri, selectedUri, destinationFile, preset, - MasterImage.getImage().getHighresImage(), + PrimaryImage.getImage().getHighresImage(), flatten, quality, sizeFactor, exit); } return START_REDELIVER_INTENT; diff --git a/src/com/android/gallery3d/filtershow/pipeline/RenderingRequest.java b/src/com/android/gallery3d/filtershow/pipeline/RenderingRequest.java index 4cb9e5ad5..e98e44f69 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/RenderingRequest.java +++ b/src/com/android/gallery3d/filtershow/pipeline/RenderingRequest.java @@ -23,7 +23,7 @@ import com.android.gallery3d.app.Log; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.cache.BitmapCache; import com.android.gallery3d.filtershow.filters.FiltersManager; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; public class RenderingRequest { private static final String LOGTAG = "RenderingRequest"; @@ -71,14 +71,14 @@ public class RenderingRequest { bitmap = pipeline.renderGeometryIcon(source, preset); } else if (type != PARTIAL_RENDERING && type != HIGHRES_RENDERING && type != GEOMETRY_RENDERING && type != FILTERS_RENDERING) { - bitmap = MasterImage.getImage().getBitmapCache().getBitmap( + bitmap = PrimaryImage.getImage().getBitmapCache().getBitmap( source.getWidth(), source.getHeight(), BitmapCache.RENDERING_REQUEST); } request.setBitmap(bitmap); ImagePreset passedPreset = new ImagePreset(preset); request.setOriginalImagePreset(preset); - request.setScaleFactor(MasterImage.getImage().getScaleFactor()); + request.setScaleFactor(PrimaryImage.getImage().getScaleFactor()); if (type == PARTIAL_RENDERING) { request.setBounds(bounds); @@ -103,7 +103,7 @@ public class RenderingRequest { RenderingRequest request = new RenderingRequest(); ImagePreset passedPreset = new ImagePreset(preset); request.setOriginalImagePreset(preset); - request.setScaleFactor(MasterImage.getImage().getScaleFactor()); + request.setScaleFactor(PrimaryImage.getImage().getScaleFactor()); request.setImagePreset(passedPreset); request.setType(RenderingRequest.ICON_RENDERING); request.setCaller(caller); diff --git a/src/com/android/gallery3d/filtershow/pipeline/UpdatePreviewTask.java b/src/com/android/gallery3d/filtershow/pipeline/UpdatePreviewTask.java index 61ee8eb71..6eaa656d8 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/UpdatePreviewTask.java +++ b/src/com/android/gallery3d/filtershow/pipeline/UpdatePreviewTask.java @@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.pipeline; import android.graphics.Bitmap; import com.android.gallery3d.filtershow.filters.FiltersManager; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; public class UpdatePreviewTask extends ProcessingTask { private static final String LOGTAG = "UpdatePreviewTask"; @@ -54,8 +54,8 @@ public class UpdatePreviewTask extends ProcessingTask { @Override public Result doInBackground(Request message) { - SharedBuffer buffer = MasterImage.getImage().getPreviewBuffer(); - SharedPreset preset = MasterImage.getImage().getPreviewPreset(); + SharedBuffer buffer = PrimaryImage.getImage().getPreviewBuffer(); + SharedPreset preset = PrimaryImage.getImage().getPreviewPreset(); ImagePreset renderingPreset = preset.dequeuePreset(); if (renderingPreset != null) { mPreviewPipeline.compute(buffer, renderingPreset, 0); @@ -69,7 +69,7 @@ public class UpdatePreviewTask extends ProcessingTask { @Override public void onResult(Result message) { - MasterImage.getImage().notifyObservers(); + PrimaryImage.getImage().notifyObservers(); if (mHasUnhandledPreviewRequest) { updatePreview(); } diff --git a/src/com/android/gallery3d/filtershow/state/StateAdapter.java b/src/com/android/gallery3d/filtershow/state/StateAdapter.java index 522585280..0505b42f8 100644 --- a/src/com/android/gallery3d/filtershow/state/StateAdapter.java +++ b/src/com/android/gallery3d/filtershow/state/StateAdapter.java @@ -25,7 +25,7 @@ import com.android.gallery3d.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; import com.android.gallery3d.filtershow.filters.FilterRepresentation; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import java.util.Vector; @@ -52,7 +52,7 @@ public class StateAdapter extends ArrayAdapter<State> { State state = getItem(position); view.setState(state); view.setOrientation(mOrientation); - FilterRepresentation currentRep = MasterImage.getImage().getCurrentFilterRepresentation(); + FilterRepresentation currentRep = PrimaryImage.getImage().getCurrentFilterRepresentation(); FilterRepresentation stateRep = state.getFilterRepresentation(); if (currentRep != null && stateRep != null && currentRep.getFilterClass() == stateRep.getFilterClass() diff --git a/src/com/android/gallery3d/filtershow/state/StatePanel.java b/src/com/android/gallery3d/filtershow/state/StatePanel.java index 039bc2ca0..36748302d 100644 --- a/src/com/android/gallery3d/filtershow/state/StatePanel.java +++ b/src/com/android/gallery3d/filtershow/state/StatePanel.java @@ -24,9 +24,10 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageButton; import android.widget.LinearLayout; + import com.android.gallery3d.R; import com.android.gallery3d.filtershow.category.MainPanel; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.util.FilterShowHelper; public class StatePanel extends Fragment { @@ -48,7 +49,7 @@ public class StatePanel extends Fragment { View panel = mMainView.findViewById(R.id.listStates); track = (StatePanelTrack) panel; - track.setAdapter(MasterImage.getImage().getState()); + track.setAdapter(PrimaryImage.getImage().getState()); mToggleVersionsPanel = (ImageButton) mMainView.findViewById(R.id.toggleVersionsPanel); if (FilterShowHelper.shouldUseVersions()) { if (mToggleVersionsPanel.getVisibility() == View.GONE diff --git a/src/com/android/gallery3d/filtershow/state/StatePanelTrack.java b/src/com/android/gallery3d/filtershow/state/StatePanelTrack.java index 4ddb363db..18bfa95a0 100644 --- a/src/com/android/gallery3d/filtershow/state/StatePanelTrack.java +++ b/src/com/android/gallery3d/filtershow/state/StatePanelTrack.java @@ -31,11 +31,12 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Adapter; import android.widget.LinearLayout; + import com.android.gallery3d.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; import com.android.gallery3d.filtershow.filters.FilterRepresentation; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; public class StatePanelTrack extends LinearLayout implements PanelTrack { @@ -89,8 +90,8 @@ public class StatePanelTrack extends LinearLayout implements PanelTrack { mEndElemWidth = LayoutParams.MATCH_PARENT; mEndElemHeight = mElemEndSize; } - GestureDetector.SimpleOnGestureListener simpleOnGestureListener - = new GestureDetector.SimpleOnGestureListener(){ + GestureDetector.SimpleOnGestureListener simpleOnGestureListener = + new GestureDetector.SimpleOnGestureListener(){ @Override public void onLongPress(MotionEvent e) { longPress(e); @@ -259,7 +260,7 @@ public class StatePanelTrack extends LinearLayout implements PanelTrack { && System.currentTimeMillis() - mTouchTime < mMaxTouchDelay) { FilterRepresentation representation = mCurrentView.getState().getFilterRepresentation(); mCurrentView.setSelected(true); - if (representation != MasterImage.getImage().getCurrentFilterRepresentation()) { + if (representation != PrimaryImage.getImage().getCurrentFilterRepresentation()) { FilterShowActivity activity = (FilterShowActivity) getContext(); activity.showRepresentation(representation); mCurrentView.setSelected(false); @@ -269,7 +270,8 @@ public class StatePanelTrack extends LinearLayout implements PanelTrack { || (!mStartedDrag && event.getActionMasked() == MotionEvent.ACTION_CANCEL)) { checkEndState(); if (mCurrentView != null) { - FilterRepresentation representation = mCurrentView.getState().getFilterRepresentation(); + FilterRepresentation representation = + mCurrentView.getState().getFilterRepresentation(); if (representation.getEditorId() == ImageOnlyEditor.ID) { mCurrentView.setSelected(false); } @@ -285,7 +287,8 @@ public class StatePanelTrack extends LinearLayout implements PanelTrack { int origin = findChild(mCurrentView); if (origin != -1) { State current = mAdapter.getItem(origin); - FilterRepresentation currentRep = MasterImage.getImage().getCurrentFilterRepresentation(); + FilterRepresentation currentRep = + PrimaryImage.getImage().getCurrentFilterRepresentation(); FilterRepresentation removedRep = current.getFilterRepresentation(); mAdapter.remove(current); fillContent(true); diff --git a/src/com/android/gallery3d/filtershow/state/StateView.java b/src/com/android/gallery3d/filtershow/state/StateView.java index a43cd47ba..6875de19a 100644 --- a/src/com/android/gallery3d/filtershow/state/StateView.java +++ b/src/com/android/gallery3d/filtershow/state/StateView.java @@ -26,7 +26,7 @@ import com.android.gallery3d.R; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.category.SwipableView; import com.android.gallery3d.filtershow.filters.FilterRepresentation; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.pipeline.ImagePreset; public class StateView extends View implements SwipableView { @@ -314,18 +314,18 @@ public class StateView extends View implements SwipableView { mStartTouchY = event.getY(); mStartTouchX = event.getX(); if (mType == BEGIN) { - MasterImage.getImage().setShowsOriginal(true); + PrimaryImage.getImage().setShowsOriginal(true); } } if (event.getActionMasked() == MotionEvent.ACTION_UP || event.getActionMasked() == MotionEvent.ACTION_CANCEL) { setTranslationX(0); setTranslationY(0); - MasterImage.getImage().setShowsOriginal(false); + PrimaryImage.getImage().setShowsOriginal(false); if (mType != BEGIN && event.getActionMasked() == MotionEvent.ACTION_UP) { setSelected(true); FilterRepresentation representation = getState().getFilterRepresentation(); - MasterImage image = MasterImage.getImage(); + PrimaryImage image = PrimaryImage.getImage(); ImagePreset preset = image != null ? image.getCurrentPreset() : null; if (getTranslationY() == 0 && image != null && preset != null diff --git a/src/com/android/gallery3d/filtershow/tools/SaveImage.java b/src/com/android/gallery3d/filtershow/tools/SaveImage.java index 17d698f15..8711465af 100644 --- a/src/com/android/gallery3d/filtershow/tools/SaveImage.java +++ b/src/com/android/gallery3d/filtershow/tools/SaveImage.java @@ -37,7 +37,7 @@ import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.cache.ImageLoader; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.filters.FiltersManager; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.pipeline.CachingPipeline; import com.android.gallery3d.filtershow.pipeline.ImagePreset; import com.android.gallery3d.filtershow.pipeline.ProcessingService; @@ -247,7 +247,7 @@ public class SaveImage { if (mimeType == null) { mimeType = ImageLoader.getMimeType(mSelectedImageUri); } - if (mimeType.equals(ImageLoader.JPEG_MIME_TYPE)) { + if ((mimeType != null) && mimeType.equals(ImageLoader.JPEG_MIME_TYPE)) { InputStream inStream = null; try { inStream = mContext.getContentResolver().openInputStream(source); @@ -535,7 +535,7 @@ public class SaveImage { public static void saveImage(ImagePreset preset, final FilterShowActivity filterShowActivity, File destination) { Uri selectedImageUri = filterShowActivity.getSelectedImageUri(); - Uri sourceImageUri = MasterImage.getImage().getUri(); + Uri sourceImageUri = PrimaryImage.getImage().getUri(); boolean flatten = false; if (preset.contains(FilterRepresentation.TYPE_TINYPLANET)){ flatten = true; diff --git a/src/com/android/gallery3d/filtershow/tools/XmpPresets.java b/src/com/android/gallery3d/filtershow/tools/XmpPresets.java index 7095e742d..164cb51ca 100644 --- a/src/com/android/gallery3d/filtershow/tools/XmpPresets.java +++ b/src/com/android/gallery3d/filtershow/tools/XmpPresets.java @@ -25,7 +25,7 @@ import com.adobe.xmp.XMPMeta; import com.adobe.xmp.XMPMetaFactory; import com.android.gallery3d.R; import com.android.gallery3d.common.Utils; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.pipeline.ImagePreset; import com.android.gallery3d.util.XmpUtilHelper; @@ -89,7 +89,7 @@ public class XmpPresets { } public static XMresults extractXMPData( - Context context, MasterImage mMasterImage, Uri uriToEdit) { + Context context, PrimaryImage mPrimaryImage, Uri uriToEdit) { XMresults ret = new XMresults(); InputStream is = null; diff --git a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java index 9f726b4a8..67adc8217 100644 --- a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java +++ b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java @@ -34,7 +34,7 @@ import android.widget.TextView; import com.android.gallery3d.R; import com.android.gallery3d.filtershow.FilterShowActivity; -import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.filtershow.imageshow.PrimaryImage; import com.android.gallery3d.filtershow.pipeline.ImagePreset; import com.android.gallery3d.filtershow.pipeline.ProcessingService; import com.android.gallery3d.filtershow.tools.SaveImage; @@ -105,8 +105,8 @@ public class ExportDialog extends DialogFragment implements View.OnClickListener mHeightText = (EditText) view.findViewById(R.id.editableHeight); mEstimatedSize = (TextView) view.findViewById(R.id.estimadedSize); - mOriginalBounds = MasterImage.getImage().getOriginalBounds(); - ImagePreset preset = MasterImage.getImage().getPreset(); + mOriginalBounds = PrimaryImage.getImage().getOriginalBounds(); + ImagePreset preset = PrimaryImage.getImage().getPreset(); mOriginalBounds = preset.finalGeometryRect(mOriginalBounds.width(), mOriginalBounds.height()); mRatio = mOriginalBounds.width() / (float) mOriginalBounds.height(); @@ -156,10 +156,10 @@ public class ExportDialog extends DialogFragment implements View.OnClickListener break; case R.id.done: FilterShowActivity activity = (FilterShowActivity) getActivity(); - Uri sourceUri = MasterImage.getImage().getUri(); + Uri sourceUri = PrimaryImage.getImage().getUri(); File dest = SaveImage.getNewFile(activity, activity.getSelectedImageUri()); float scaleFactor = mExportWidth / (float) mOriginalBounds.width(); - Intent processIntent = ProcessingService.getSaveIntent(activity, MasterImage + Intent processIntent = ProcessingService.getSaveIntent(activity, PrimaryImage .getImage().getPreset(), dest, activity.getSelectedImageUri(), sourceUri, true, mSeekBar.getProgress(), scaleFactor, false); activity.startService(processIntent); @@ -169,7 +169,7 @@ public class ExportDialog extends DialogFragment implements View.OnClickListener } public void updateCompressionFactor() { - Bitmap bitmap = MasterImage.getImage().getFilteredImage(); + Bitmap bitmap = PrimaryImage.getImage().getFilteredImage(); if (bitmap == null) { return; } diff --git a/src/com/android/gallery3d/ingest/IngestActivity.java b/src/com/android/gallery3d/ingest/IngestActivity.java index b0b3e0532..917a77f76 100644 --- a/src/com/android/gallery3d/ingest/IngestActivity.java +++ b/src/com/android/gallery3d/ingest/IngestActivity.java @@ -99,7 +99,7 @@ public class IngestActivity extends Activity implements setContentView(R.layout.ingest_activity_item_list); mGridView = (IngestGridView) findViewById(R.id.ingest_gridview); mAdapter = new MtpAdapter(this); - mAdapter.registerDataSetObserver(mMasterObserver); + mAdapter.registerDataSetObserver(mPrimaryObserver); mGridView.setAdapter(mAdapter); mGridView.setMultiChoiceModeListener(mMultiChoiceModeListener); mGridView.setOnItemClickListener(mOnItemClickListener); @@ -336,7 +336,7 @@ public class IngestActivity extends Activity implements } } - private DataSetObserver mMasterObserver = new DataSetObserver() { + private DataSetObserver mPrimaryObserver = new DataSetObserver() { @Override public void onChanged() { if (mPagerAdapter != null) { diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java index 22b3b575a..e998f6a77 100644 --- a/src/com/android/gallery3d/ui/MenuExecutor.java +++ b/src/com/android/gallery3d/ui/MenuExecutor.java @@ -172,7 +172,6 @@ public class MenuExecutor { boolean supportTrim = (supported & MediaObject.SUPPORT_TRIM) != 0; boolean supportMute = (supported & MediaObject.SUPPORT_MUTE) != 0; boolean supportShare = (supported & MediaObject.SUPPORT_SHARE) != 0; - boolean supportSetAs = (supported & MediaObject.SUPPORT_SETAS) != 0; boolean supportShowOnMap = (supported & MediaObject.SUPPORT_SHOW_ON_MAP) != 0; boolean supportCache = (supported & MediaObject.SUPPORT_CACHE) != 0; boolean supportEdit = (supported & MediaObject.SUPPORT_EDIT) != 0; @@ -189,7 +188,6 @@ public class MenuExecutor { // Hide panorama until call to updateMenuForPanorama corrects it setMenuItemVisible(menu, R.id.action_share_panorama, false); setMenuItemVisible(menu, R.id.action_share, supportShare); - setMenuItemVisible(menu, R.id.action_setas, supportSetAs); setMenuItemVisible(menu, R.id.action_show_on_map, supportShowOnMap); setMenuItemVisible(menu, R.id.action_edit, supportEdit); // setMenuItemVisible(menu, R.id.action_simple_edit, supportEdit); @@ -250,15 +248,6 @@ public class MenuExecutor { ((Activity) mActivity).startActivity(Intent.createChooser(intent, null)); return; } - case R.id.action_setas: { - Intent intent = getIntentBySingleSelectedPath(Intent.ACTION_ATTACH_DATA) - .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - intent.putExtra("mimeType", intent.getType()); - Activity activity = mActivity; - activity.startActivity(Intent.createChooser( - intent, activity.getString(R.string.set_as))); - return; - } case R.id.action_delete: title = R.string.delete; break; diff --git a/src/com/android/gallery3d/util/SaveVideoFileUtils.java b/src/com/android/gallery3d/util/SaveVideoFileUtils.java index bef75bac4..7c6ba5eb2 100644 --- a/src/com/android/gallery3d/util/SaveVideoFileUtils.java +++ b/src/com/android/gallery3d/util/SaveVideoFileUtils.java @@ -28,6 +28,7 @@ import android.provider.MediaStore.Video.VideoColumns; import com.android.gallery3d.filtershow.tools.SaveImage.ContentResolverQueryCallback; import java.io.File; +import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; @@ -101,7 +102,7 @@ public class SaveVideoFileUtils { values.put(Video.Media.DATE_ADDED, nowInSec); values.put(Video.Media.DATA, mDstFileInfo.mFile.getAbsolutePath()); values.put(Video.Media.SIZE, mDstFileInfo.mFile.length()); - int durationMs = retriveVideoDurationMs(mDstFileInfo.mFile.getPath()); + int durationMs = retrieveVideoDurationMs(mDstFileInfo.mFile.getPath()); values.put(Video.Media.DURATION, durationMs); // Copy the data taken and location info from src. String[] projection = new String[] { @@ -137,7 +138,7 @@ public class SaveVideoFileUtils { return contentResolver.insert(Video.Media.EXTERNAL_CONTENT_URI, values); } - public static int retriveVideoDurationMs(String path) { + private static int retrieveVideoDurationMs(String path) { int durationMs = 0; // Calculate the duration of the destination file. MediaMetadataRetriever retriever = new MediaMetadataRetriever(); @@ -147,7 +148,11 @@ public class SaveVideoFileUtils { if (duration != null) { durationMs = Integer.parseInt(duration); } - retriever.release(); + try { + retriever.release(); + } catch (IOException e) { + // Ignore errors occurred while releasing the retriever. + } return durationMs; } diff --git a/src/com/android/photos/MultiChoiceManager.java b/src/com/android/photos/MultiChoiceManager.java index 49519ca63..e53746a88 100644 --- a/src/com/android/photos/MultiChoiceManager.java +++ b/src/com/android/photos/MultiChoiceManager.java @@ -137,7 +137,6 @@ public class MultiChoiceManager implements MultiChoiceModeListener, MenuItem cropItem = menu.findItem(R.id.menu_crop); MenuItem trimItem = menu.findItem(R.id.menu_trim); MenuItem muteItem = menu.findItem(R.id.menu_mute); - MenuItem setAsItem = menu.findItem(R.id.menu_set_as); editItem.setVisible((supportedOperations & MediaObject.SUPPORT_EDIT) > 0); deleteItem.setVisible((supportedOperations & MediaObject.SUPPORT_DELETE) > 0); @@ -145,7 +144,6 @@ public class MultiChoiceManager implements MultiChoiceModeListener, cropItem.setVisible((supportedOperations & MediaObject.SUPPORT_CROP) > 0); trimItem.setVisible((supportedOperations & MediaObject.SUPPORT_TRIM) > 0); muteItem.setVisible((supportedOperations & MediaObject.SUPPORT_MUTE) > 0); - setAsItem.setVisible((supportedOperations & MediaObject.SUPPORT_SETAS) > 0); } @Override @@ -217,7 +215,6 @@ public class MultiChoiceManager implements MultiChoiceModeListener, case R.id.menu_crop: case R.id.menu_trim: case R.id.menu_mute: - case R.id.menu_set_as: singleItemAction(getSelectedItem(), actionItemId); mode.finish(); return true; @@ -256,14 +253,6 @@ public class MultiChoiceManager implements MultiChoiceModeListener, muteVideo.muteInBackground(); */ return; - case R.id.menu_set_as: - intent.setDataAndType(uri, mime) - .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) - .setAction(Intent.ACTION_ATTACH_DATA) - .putExtra("mimeType", mime); - mContext.startActivity(Intent.createChooser( - intent, mContext.getString(R.string.set_as))); - return; default: return; } diff --git a/src/com/android/photos/SelectionManager.java b/src/com/android/photos/SelectionManager.java index 9bfb9be75..98b827bb3 100644 --- a/src/com/android/photos/SelectionManager.java +++ b/src/com/android/photos/SelectionManager.java @@ -90,9 +90,6 @@ public class SelectionManager { if ((itemSupportedOperations & MediaObject.SUPPORT_CROP) > 0) { mSelectedCroppableCount += increment; } - if ((itemSupportedOperations & MediaObject.SUPPORT_SETAS) > 0) { - mSelectedSetableCount += increment; - } if ((itemSupportedOperations & MediaObject.SUPPORT_TRIM) > 0) { mSelectedTrimmableCount += increment; } @@ -147,9 +144,6 @@ public class SelectionManager { if (mSelectedEditableCount == 1) { supported |= MediaObject.SUPPORT_EDIT; } - if (mSelectedSetableCount == 1) { - supported |= MediaObject.SUPPORT_SETAS; - } if (mSelectedTrimmableCount == 1) { supported |= MediaObject.SUPPORT_TRIM; } |