package com.android.gallery3d.filtershow.editors;
import android.content.Context;
+import android.content.res.Configuration;
import android.util.AttributeSet;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
mEditTitle = editTitle;
mFilterTitle = stateButton;
mButton = editTitle;
- setMenuIcon(true);
+ MasterImage.getImage().resetGeometryImages(false);
setUtilityPanelUI(actionButton, editControl);
}
public boolean showsPopupIndicator() {
- return true;
+ return false;
}
/**
R.layout.filtershow_seekbar, (ViewGroup) editControl, true);
mSeekBar = (SeekBar) lp.findViewById(R.id.primarySeekBar);
mSeekBar.setOnSeekBarChangeListener(this);
-
- if (showsSeekBar()) {
- mSeekBar.setOnSeekBarChangeListener(this);
- mSeekBar.setVisibility(View.VISIBLE);
- } else {
- mSeekBar.setVisibility(View.INVISIBLE);
+ mSeekBar.setVisibility(View.GONE);
+ if (context.getResources().getConfiguration().orientation
+ == Configuration.ORIENTATION_PORTRAIT) {
+ if (showsSeekBar()) {
+ mSeekBar.setVisibility(View.VISIBLE);
+ }
}
if (mButton != null) {
- if (showsPopupIndicator()) {
- mButton.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0,
- R.drawable.filtershow_menu_marker, 0);
- } else {
- mButton.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0);
- }
+ setMenuIcon(showsPopupIndicator());
}
}
}
- public void createEditor(Context context,FrameLayout frameLayout) {
+ public void createEditor(Context context, FrameLayout frameLayout) {
mContext = context;
mFrameLayout = frameLayout;
mLocalRepresentation = null;
}
/**
- * Call this to update the preset in MasterImage with the current representation
- * returned by getLocalRepresentation. This causes the preview bitmap to be
- * regenerated.
+ * Call this to update the preset in MasterImage with the current representation
+ * returned by getLocalRepresentation. This causes the preview bitmap to be
+ * regenerated.
*/
public void commitLocalRepresentation() {
commitLocalRepresentation(getLocalRepresentation());
}
/**
- * Call this to update the preset in MasterImage with a given representation.
- * This causes the preview bitmap to be regenerated.
+ * Call this to update the preset in MasterImage with a given representation.
+ * This causes the preview bitmap to be regenerated.
*/
public void commitLocalRepresentation(FilterRepresentation rep) {
ArrayList<FilterRepresentation> filter = new ArrayList<FilterRepresentation>(1);
}
/**
- * Call this to update the preset in MasterImage with a collection of FilterRepresnations.
- * This causes the preview bitmap to be regenerated.
+ * Call this to update the preset in MasterImage with a collection of FilterRepresentations.
+ * This causes the preview bitmap to be regenerated.
*/
public void commitLocalRepresentation(Collection<FilterRepresentation> reps) {
ImagePreset preset = MasterImage.getImage().getPreset();
}
if (mChangesGeometry) {
// Regenerate both the filtered and the geometry-only bitmaps
- MasterImage.getImage().updatePresets(true);
- } else {
- // Regenerate only the filtered bitmap.
- MasterImage.getImage().invalidateFiltersOnly();
+ MasterImage.getImage().resetGeometryImages(true);
}
+ // Regenerate the filtered bitmap.
+ MasterImage.getImage().invalidateFiltersOnly();
preset.fillImageStateAdapter(MasterImage.getImage().getState());
}
}
public void openUtilityPanel(LinearLayout mAccessoryViewList) {
- setMenuIcon(false);
+ setMenuIcon(showsPopupIndicator());
if (mImageShow != null) {
mImageShow.openUtilityPanel(mAccessoryViewList);
}
protected void setMenuIcon(boolean on) {
mEditTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(
- 0, 0, on ? R.drawable.filtershow_menu_marker : 0, 0);
+ 0, 0, on ? R.drawable.filtershow_menu_marker_rtl : 0, 0);
}
protected void createMenu(int[] strId, View button) {
public Control[] getControls() {
return null;
}
+
@Override
public void onStartTrackingTouch(SeekBar arg0) {
}
public void detach() {
+ if (mImageShow != null) {
+ mImageShow.detach();
+ }
}
}