Commit 11c51d45 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android Git Automerger
Browse files

am d4715aa2: am 5b188c94: Disabled further filters after Tiny Planet.

* commit 'd4715aa2':
  Disabled further filters after Tiny Planet.
parents 360ae4dd d4715aa2
......@@ -231,6 +231,11 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
mGeometryButton = (ImageButton) findViewById(R.id.geometryButton);
mColorsButton = (ImageButton) findViewById(R.id.colorsButton);
mBottomPanelButtons.add(mFxButton);
mBottomPanelButtons.add(mBorderButton);
mBottomPanelButtons.add(mGeometryButton);
mBottomPanelButtons.add(mColorsButton);
mImageShow.setImageLoader(mImageLoader);
mImageCurves.setImageLoader(mImageLoader);
mImageCurves.setMaster(mImageShow);
......@@ -796,6 +801,22 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
}
}
public void disableFilterButtons() {
for (ImageButton b : mBottomPanelButtons) {
b.setEnabled(false);
b.setClickable(false);
b.setAlpha(0.4f);
}
}
public void enableFilterButtons() {
for (ImageButton b : mBottomPanelButtons) {
b.setEnabled(true);
b.setClickable(true);
b.setAlpha(1.0f);
}
}
// //////////////////////////////////////////////////////////////////////////////
// imageState panel...
......@@ -877,7 +898,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
invalidateOptionsMenu();
}
private void resetHistory() {
void resetHistory() {
mNullFxFilter.onClick(mNullFxFilter);
mNullBorderFilter.onClick(mNullBorderFilter);
......
......@@ -56,6 +56,7 @@ public class PanelController implements OnClickListener {
private static int HORIZONTAL_MOVE = 1;
private static final int ANIM_DURATION = 200;
private static final String LOGTAG = "PanelController";
private boolean mDisableFilterButtons = false;
class Panel {
private final View mView;
......@@ -345,6 +346,10 @@ public class PanelController implements OnClickListener {
mCurrentImage.resetParameter();
mCurrentImage.select();
}
if (mDisableFilterButtons) {
mActivity.enableFilterButtons();
mDisableFilterButtons = false;
}
}
public boolean onBackPressed() {
......@@ -356,6 +361,11 @@ public class PanelController implements OnClickListener {
mMasterImage.onItemClick(position);
showPanel(mCurrentPanel);
mCurrentImage.select();
if (mDisableFilterButtons) {
mActivity.enableFilterButtons();
mActivity.resetHistory();
mDisableFilterButtons = false;
}
return false;
}
......@@ -593,6 +603,10 @@ public class PanelController implements OnClickListener {
String ename = mCurrentImage.getContext().getString(R.string.tinyplanet);
mUtilityPanel.setEffectName(ename);
ensureFilter(ename);
if (!mDisableFilterButtons) {
mActivity.disableFilterButtons();
mDisableFilterButtons = true;
}
break;
}
case R.id.straightenButton: {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment