Merge "fix menu indicator inconsistency" into gb-ub-photos-carlsbad (0594bd40) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/filtershow/editors/Editor.java

+4 −9

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ 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;
		@@ -96,12 +97,11 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
		mFilterTitle = stateButton;
		mButton = editTitle;
		MasterImage.getImage().resetGeometryImages(false);
		setMenuIcon(true);
		setUtilityPanelUI(actionButton, editControl);
		}

		public boolean showsPopupIndicator() {
		return true;
		return false;
		}

		/**
		@@ -127,12 +127,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
		}

		if (mButton != null) {
		if (showsPopupIndicator()) {
		mButton.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0,
		R.drawable.filtershow_menu_marker, 0);
		} else {
		mButton.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0);
		}
		setMenuIcon(showsPopupIndicator());
		}
		}

		@@ -282,7 +277,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
		}

		public void openUtilityPanel(LinearLayout mAccessoryViewList) {
		setMenuIcon(false);
		setMenuIcon(showsPopupIndicator());
		if (mImageShow != null) {
		mImageShow.openUtilityPanel(mAccessoryViewList);
		}

src/com/android/gallery3d/filtershow/editors/EditorChanSat.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,8 @@ public class EditorChanSat extends ParametricEditor implements OnSeekBarChangeLi
		FilterChanSatRepresentation csrep = getChanSatRep();
		String menuString = mContext.getString(mMenuStrings[0]);
		switchToMode(csrep, FilterChanSatRepresentation.MODE_MASTER, menuString);
		} else {
		mButton.setText(mContext.getString(R.string.saturation));
		}
		}

src/com/android/gallery3d/filtershow/editors/EditorCurves.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.gallery3d.filtershow.editors;

		import android.content.Context;
		import android.view.View;
		import android.widget.FrameLayout;

		import com.android.gallery3d.R;
		@@ -38,6 +39,11 @@ public class EditorCurves extends Editor {

		}

		@Override
		public boolean showsPopupIndicator() {
		return true;
		}

		@Override
		public void createEditor(Context context, FrameLayout frameLayout) {
		super.createEditor(context, frameLayout);
		@@ -54,6 +60,11 @@ public class EditorCurves extends Editor {
		mImageCurves.setFilterDrawRepresentation(drawRep);
		}
		}
		@Override
		public void setUtilityPanelUI(View actionButton, View editControl) {
		super.setUtilityPanelUI(actionButton,editControl);
		setMenuIcon(true);
		}

		@Override
		public boolean showsSeekBar() {

src/com/android/gallery3d/filtershow/editors/EditorDraw.java

+12 −7

Original line number	Diff line number	Diff line
		@@ -130,6 +130,7 @@ public class EditorDraw extends ParametricEditor implements FilterView {
		@Override
		public void openUtilityPanel(final LinearLayout accessoryViewList) {
		Button view = (Button) accessoryViewList.findViewById(R.id.applyEffect);
		if (useCompact(mContext)) {
		view.setText(mContext.getString(R.string.draw_hue));
		view.setOnClickListener(new OnClickListener() {

		@@ -138,6 +139,9 @@ public class EditorDraw extends ParametricEditor implements FilterView {
		showPopupMenu(accessoryViewList);
		}
		});
		} else {
		view.setText(mContext.getString(R.string.imageDraw));
		}
		}

		@Override
		@@ -224,6 +228,7 @@ public class EditorDraw extends ParametricEditor implements FilterView {
		R.layout.filtershow_draw_ui, (ViewGroup) editControl, true);

		mTabletUI = new EditorDrawTabletUI(this, mContext, lp);
		setMenuIcon(false);

		}

src/com/android/gallery3d/filtershow/editors/EditorGrad.java

+31 −11

Original line number	Diff line number	Diff line
		@@ -111,6 +111,7 @@ public class EditorGrad extends ParametricEditor
		@Override
		public void openUtilityPanel(final LinearLayout accessoryViewList) {
		Button view = (Button) accessoryViewList.findViewById(R.id.applyEffect);
		if (useCompact(mContext)) {
		view.setText(mContext.getString(R.string.editor_grad_brightness));
		view.setOnClickListener(new OnClickListener() {
		@Override
		@@ -121,6 +122,9 @@ public class EditorGrad extends ParametricEditor

		setUpPopupMenu(view);
		setEffectName();
		} else {
		view.setText(mContext.getString(R.string.grad));
		}
		}

		private void updateMenuItems(FilterGradRepresentation rep) {
		@@ -167,6 +171,7 @@ public class EditorGrad extends ParametricEditor
		fireRightAction();
		}
		});
		setMenuIcon(false);
		}

		public void updateParameters() {
		@@ -206,13 +211,28 @@ public class EditorGrad extends ParametricEditor
		FilterGradRepresentation rep = getGradRepresentation();
		int value = progress + mMin;
		rep.setParameter(mMode, value);
		if (mSliderMode != mMode) {
		mSliderMode = mMode;
		mEffectName = "";
		mEffectName = mContext.getResources().getString(getModeNameid(mMode));
		mEffectName = mEffectName.toUpperCase();
		}
		mTextView.setText(Integer.toString(value));
		mView.invalidate();
		commitLocalRepresentation();
		}

		private int getModeNameid(int mode) {
		switch (mode) {
		case MODE_CONTRAST:
		return R.string.editor_grad_contrast;
		case MODE_BRIGHTNESS:
		return R.string.editor_grad_brightness;
		case MODE_SATURATION:
		return R.string.editor_grad_saturation;
		}
		return 0;
		}

		@Override
		public void onStartTrackingTouch(SeekBar seekBar) {