diff options
Diffstat (limited to 'src/com/android/gallery3d/filtershow')
3 files changed, 3 insertions, 111 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index da466f484..4133d8915 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -122,7 +122,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL private static int mImageBorderSize = 4; // in percent private boolean mShowingTinyPlanet = false; - private boolean mShowingHistoryPanel = false; private boolean mShowingImageStatePanel = false; private final Vector<ImageShow> mImageViews = new Vector<ImageShow>(); @@ -153,15 +152,12 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL fillEditors(); loadXML(); + if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) { mShowingImageStatePanel = true; } - if (mShowingHistoryPanel) { - findViewById(R.id.historyPanel).setVisibility(View.VISIBLE); - } else { - findViewById(R.id.historyPanel).setVisibility(View.GONE); - } + if (mShowingImageStatePanel && (savedInstanceState == null)) { loadImageStatePanel(); } @@ -176,7 +172,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL ((ViewStub) findViewById(R.id.stateCategoryStub)).inflate(); ((ViewStub) findViewById(R.id.editorPanelStub)).inflate(); - ((ViewStub) findViewById(R.id.historyPanelStub)).inflate(); ActionBar actionBar = getActionBar(); actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); @@ -221,7 +216,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL mPanelController.addView(findViewById(R.id.applyEffect)); - setupHistoryPanel(); setupStatePanel(); mImageCategoryPanel = findViewById(R.id.imageCategoryPanel); @@ -235,14 +229,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL mImageCategoryPanel.setVisibility(View.VISIBLE); } - public void setupHistoryPanel() { - findViewById(R.id.resetOperationsButton).setOnClickListener( - createOnClickResetOperationsButton()); - ListView operationsList = (ListView) findViewById(R.id.operationsList); - operationsList.setAdapter(mMasterImage.getHistory()); - operationsList.setOnItemClickListener(this); - } - public void setupStatePanel() { mImageLoader.setAdapter(mMasterImage.getHistory()); mPanelController.setRowPanel(findViewById(R.id.secondRowPanel)); @@ -509,7 +495,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } pipeline.turnOnPipeline(true); MasterImage.getImage().setOriginalGeometry(largeBitmap); - MasterImage.getImage().getHistory().setOriginalBitmap(mImageLoader.getOriginalBitmapSmall()); mLoadBitmapTask = null; if (mAction == CROP_ACTION) { @@ -660,12 +645,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.filtershow_activity_menu, menu); - MenuItem showHistory = menu.findItem(R.id.operationsButton); - if (mShowingHistoryPanel) { - showHistory.setTitle(R.string.hide_history_panel); - } else { - showHistory.setTitle(R.string.show_history_panel); - } MenuItem showState = menu.findItem(R.id.showImageStateButton); if (mShowingImageStatePanel) { showState.setTitle(R.string.hide_imagestate_panel); @@ -728,10 +707,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL toggleImageStatePanel(); return true; } - case R.id.operationsButton: { - toggleHistoryPanel(); - return true; - } case android.R.id.home: { saveImage(); return true; @@ -844,10 +819,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL // ////////////////////////////////////////////////////////////////////////////// // imageState panel... - public boolean isShowingHistoryPanel() { - return mShowingHistoryPanel; - } - private void toggleImageStatePanel() { invalidateOptionsMenu(); } @@ -876,9 +847,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL if (mShowingImageStatePanel) { loadImageStatePanel(); } - if (mShowingHistoryPanel) { - toggleHistoryPanel(); - } if (mShowingTinyPlanet == false) { View tinyPlanetView = findViewById(EditorTinyPlanet.ID); if (tinyPlanetView != null) { @@ -911,61 +879,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } } - // ////////////////////////////////////////////////////////////////////////////// - // history panel... - - public void toggleHistoryPanel() { - final View view = findViewById(R.id.mainPanel); - final View viewList = findViewById(R.id.historyPanel); - - int translate = translateMainPanel(viewList); - if (!mShowingHistoryPanel) { - mShowingHistoryPanel = true; - if (getResources().getConfiguration().orientation - == Configuration.ORIENTATION_PORTRAIT) { - // If portrait, always remove the state panel - mShowingImageStatePanel = false; - if (PanelController.useAnimationsLayer()) { - view.animate().setDuration(200).x(translate) - .withLayer().withEndAction(new Runnable() { - @Override - public void run() { - viewList.setAlpha(0); - viewList.setVisibility(View.VISIBLE); - viewList.animate().setDuration(100) - .alpha(1.0f).start(); - } - }).start(); - } else { - view.setX(translate); - viewList.setAlpha(0); - viewList.setVisibility(View.VISIBLE); - viewList.animate().setDuration(100) - .alpha(1.0f).start(); - } - } else { - findViewById(R.id.filtersPanel).setVisibility(View.GONE); - viewList.setVisibility(View.VISIBLE); - } - } else { - mShowingHistoryPanel = false; - if (getResources().getConfiguration().orientation - == Configuration.ORIENTATION_PORTRAIT) { - viewList.setVisibility(View.INVISIBLE); - if (PanelController.useAnimationsLayer()) { - view.animate().setDuration(200).x(0).withLayer() - .start(); - } else { - view.setX(0); - } - } else { - viewList.setVisibility(View.GONE); - findViewById(R.id.filtersPanel).setVisibility(View.VISIBLE); - } - } - invalidateOptionsMenu(); - } - public void dispatchNullFilterClick() { mNullFxFilter.onClick(mNullFxFilter); mNullBorderFilter.onClick(mNullBorderFilter); @@ -981,16 +894,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL invalidateViews(); } - // reset button in the history panel. - private OnClickListener createOnClickResetOperationsButton() { - return new View.OnClickListener() { - @Override - public void onClick(View v) { - resetHistory(); - } - }; - } - @Override public void onBackPressed() { if (mPanelController.onBackPressed()) { diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java index 1ab9e5466..65fe523c0 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java @@ -49,7 +49,6 @@ public class ImageShow extends View implements OnGestureListener, OnDoubleTapListener { private static final String LOGTAG = "ImageShow"; - private static final boolean ENABLE_HISTORY_SWAP = false; private static final boolean ENABLE_ZOOMED_COMPARISON = false; protected Paint mPaint = new Paint(); @@ -593,7 +592,7 @@ public class ImageShow extends View implements OnGestureListener, translation.y = (int) (originalTranslation.y + translateY); MasterImage.getImage().setTranslation(translation); mTouchShowOriginal = false; - } else if (enableComparison() && !mOriginalDisabled && !mActivity.isShowingHistoryPanel() + } else if (enableComparison() && !mOriginalDisabled && (System.currentTimeMillis() - mTouchShowOriginalDate > mTouchShowOriginalDelayMin) && event.getPointerCount() == 1) { @@ -665,15 +664,6 @@ public class ImageShow extends View implements OnGestureListener, if (endEvent.getPointerCount() == 2) { return false; } - if (ENABLE_HISTORY_SWAP && (!mActivity.isShowingHistoryPanel() && startEvent.getX() > endEvent.getX()) - || (mActivity.isShowingHistoryPanel() && endEvent.getX() > startEvent.getX())) { - if (!mTouchShowOriginal - || (mTouchShowOriginal && - (System.currentTimeMillis() - mTouchShowOriginalDate - < mTouchShowOriginalDelayMax))) { - mActivity.toggleHistoryPanel(); - } - } return true; } diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java index c36befc2c..304d2db24 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java +++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java @@ -138,7 +138,6 @@ public class MasterImage implements RenderingRequestCaller { mPreset.fillImageStateAdapter(mState); if (addToHistory) { mHistory.addHistoryItem(mPreset); - renderHistoryPreview(); } updatePresets(true); GeometryMetadata geo = mPreset.mGeoData; |