Merge "AOSP/Gallery2 - Update language to comply with Android's inclusive language guidance." am: 9733e9fd18 am: 965f71fe03 am: 79b675a9fc am: 4d57a95242
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1375271
Change-Id: Iec2af73c5c91fb127dca082e2c10d0b6cbb7ea71
diff --git a/gallerycommon/src/com/android/gallery3d/common/BlobCache.java b/gallerycommon/src/com/android/gallery3d/common/BlobCache.java
index 3c131e5..af9f3d1 100644
--- a/gallerycommon/src/com/android/gallery3d/common/BlobCache.java
+++ b/gallerycommon/src/com/android/gallery3d/common/BlobCache.java
@@ -221,7 +221,7 @@
return false;
}
- // Sanity check
+ // Initial check
if (mMaxEntries <= 0) {
Log.w(TAG, "invalid max entries");
return false;
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 98f32eb..207f79e 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/filtershow/EditorPlaceHolder.java b/src/com/android/gallery3d/filtershow/EditorPlaceHolder.java
index 95fc56d..8c447b4 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 937c529..e827b82 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.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 @@
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 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 @@
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 @@
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 void setupStatePanel() {
- MasterImage.getImage().setHistoryManager(mMasterImage.getHistory());
+ PrimaryImage.getImage().setHistoryManager(mPrimaryImage.getHistory());
}
private void fillVersions() {
@@ -412,7 +414,7 @@
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 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 @@
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 @@
}
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 @@
}
}
}
- 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 @@
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 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 @@
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 @@
@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 @@
@Override
protected void onPostExecute(Boolean result) {
- MasterImage.setMaster(mMasterImage);
+ PrimaryImage.setPrimary(mPrimaryImage);
if (isCancelled()) {
return;
}
@@ -840,11 +842,11 @@
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 @@
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 @@
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 @@
}
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 @@
if (!PrintHelper.systemSupportsPrint()) {
printItem.setVisible(false);
}
- mMasterImage.getHistory().setMenuItems(undoItem, redoItem, resetItem);
+ mPrimaryImage.getHistory().setMenuItems(undoItem, redoItem, resetItem);
}
@Override
@@ -1032,17 +1034,17 @@
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 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 void updateUserPresetsFromManager() {
- ArrayList<FilterUserPresetRepresentation> presets = mUserPresetsManager.getRepresentations();
+ ArrayList<FilterUserPresetRepresentation> presets =
+ mUserPresetsManager.getRepresentations();
if (presets == null) {
return;
}
@@ -1146,7 +1149,7 @@
}
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 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 @@
super.onConfigurationChanged(newConfig);
setDefaultValues();
- if (mMasterImage == null) {
+ if (mPrimaryImage == null) {
return;
}
loadXML();
@@ -1268,25 +1271,25 @@
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 @@
if (historyItem != null) {
rep = historyItem.getFilterRepresentation();
}
- mMasterImage.setPreset(original, rep, true);
+ mPrimaryImage.setPreset(original, rep, true);
invalidateViews();
backToMain();
}
@@ -1307,12 +1310,13 @@
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 @@
@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 @@
@Override
public void onItemClick(AdapterView<?> parent, View view, int position,
long id) {
- mMasterImage.onHistoryItemClick(position);
+ mPrimaryImage.onHistoryItemClick(position);
invalidateViews();
}
@@ -1411,7 +1418,7 @@
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 52c296c..003ff48 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.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 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 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 b3a4148..5608200 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.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 @@
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 @@
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 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 75574c3..a44bf42 100644
--- a/src/com/android/gallery3d/filtershow/category/MainPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/MainPanel.java
@@ -27,7 +27,7 @@
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 @@
if (mCurrentSelected == GEOMETRY) {
return;
}
- if (MasterImage.getImage().hasTinyPlanet()) {
+ if (PrimaryImage.getImage().hasTinyPlanet()) {
return;
}
boolean fromRight = isRightAnimation(GEOMETRY);
@@ -283,7 +283,8 @@
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/CropView.java b/src/com/android/gallery3d/filtershow/crop/CropView.java
index bbb7cfd..e753752 100644
--- a/src/com/android/gallery3d/filtershow/crop/CropView.java
+++ b/src/com/android/gallery3d/filtershow/crop/CropView.java
@@ -299,7 +299,7 @@
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 @@
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 @@
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 e3eec39..eafd2ab 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.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 @@
mEditTitle = editTitle;
mFilterTitle = stateButton;
mButton = editTitle;
- MasterImage.getImage().resetGeometryImages(false);
+ PrimaryImage.getImage().resetGeometryImages(false);
setUtilityPanelUI(actionButton, editControl);
}
@@ -194,8 +194,9 @@
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 @@
}
/**
- * 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 @@
}
/**
- * 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 @@
}
/**
- * 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 6b19d3c..b6a698f 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.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 @@
@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 d6d9ee7..41cd831 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.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 @@
@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 51e01d0..199ddce 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.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 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 @@
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 9452bf0..e5d9500 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.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 @@
@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 ff84ba8..ec64142 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.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 @@
@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 c281443..5cfafdc 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.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 @@
@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 @@
@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 1fcd300..48f2e6d 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.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 @@
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 efb9cde..41560e4 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
@@ -22,7 +22,7 @@
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 @@
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 8fd5b02..742a122 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.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 @@
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 6cc4970..e1add01 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.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 @@
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 614b648..af2b7f3 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/GeometryMathUtils.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/GeometryMathUtils.java
@@ -293,7 +293,7 @@
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 @@
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 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 @@
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 4e53f82..0f2095f 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
@@ -228,8 +228,8 @@
}
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 @@
@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 26c49b1..b0c0831 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageMirror.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageMirror.java
@@ -61,8 +61,8 @@
@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 5186c09..77e8de7 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
@@ -65,8 +65,8 @@
@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 e2f21f3..04dab73 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.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.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 boolean hasModifications() {
- return MasterImage.getImage().hasModifications();
+ return PrimaryImage.getImage().hasModifications();
}
public void resetParameter() {
@@ -187,13 +187,13 @@
}
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 ImageFilter getCurrentFilter() {
- return MasterImage.getImage().getCurrentFilter();
+ return PrimaryImage.getImage().getCurrentFilter();
}
/* consider moving the following 2 methods into a subclass */
@@ -221,14 +221,15 @@
* @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 ImagePreset getImagePreset() {
- return MasterImage.getImage().getPreset();
+ return PrimaryImage.getImage().getPreset();
}
@Override
@@ -256,11 +257,11 @@
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 @@
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 @@
}
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 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 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 @@
}
}
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 void bindAsImageLoadListener() {
- MasterImage.getImage().addListener(this);
+ PrimaryImage.getImage().addListener(this);
}
public void updateImage() {
@@ -634,22 +635,23 @@
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 @@
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 @@
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 @@
}
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 @@
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 @@
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 @@
@Override
public void onAnimationEnd(Animator animation) {
applyTranslationConstraints();
- MasterImage.getImage().needsUpdatePartialPreview();
+ PrimaryImage.getImage().needsUpdatePartialPreview();
invalidate();
}
@@ -815,8 +817,8 @@
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 @@
@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 @@
@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 4742f2e..88f9b48 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
@@ -240,10 +240,10 @@
@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 25a0a90..c895099 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
@@ -140,9 +140,9 @@
@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
similarity index 97%
rename from src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rename to src/com/android/gallery3d/filtershow/imageshow/PrimaryImage.java
index f6b97f1..63e683a 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/PrimaryImage.java
@@ -48,14 +48,14 @@
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 @@
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 @@
invalidatePartialPreview();
return;
}
- Matrix originalToScreen = MasterImage.getImage().originalImageToScreen();
+ Matrix originalToScreen = PrimaryImage.getImage().originalImageToScreen();
if (originalToScreen == null) {
return;
}
@@ -721,7 +721,7 @@
}
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 1d8751d..3fc75b7 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.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 @@
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 @@
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 @@
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 a487a5d..30b2d2c 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.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 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 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 2923e3b..94ca3af 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.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 @@
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 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 @@
}
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 @@
}
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 @@
}
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 @@
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 @@
}
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 @@
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 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 9166ee3..8ad825d 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.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 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 6c6c2d9..c0b7536 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.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 @@
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 4cb9e5a..e98e44f 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.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 @@
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 @@
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 61ee8eb..6eaa656 100644
--- a/src/com/android/gallery3d/filtershow/pipeline/UpdatePreviewTask.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/UpdatePreviewTask.java
@@ -19,7 +19,7 @@
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 @@
@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 @@
@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 5225852..0505b42 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.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 @@
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 039bc2c..3674830 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.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 @@
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 4ddb363..18bfa95 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.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 @@
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 @@
&& 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 @@
|| (!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 @@
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 a43cd47..6875de1 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.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 @@
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 17d698f..c7d7b64 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.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;
@@ -535,7 +535,7 @@
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 7095e74..164cb51 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.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 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 9f726b4..67adc82 100644
--- a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java
+++ b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java
@@ -34,7 +34,7 @@
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 @@
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 @@
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 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 b0b3e05..917a77f 100644
--- a/src/com/android/gallery3d/ingest/IngestActivity.java
+++ b/src/com/android/gallery3d/ingest/IngestActivity.java
@@ -99,7 +99,7 @@
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 @@
}
}
- private DataSetObserver mMasterObserver = new DataSetObserver() {
+ private DataSetObserver mPrimaryObserver = new DataSetObserver() {
@Override
public void onChanged() {
if (mPagerAdapter != null) {
