diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2012-12-18 11:34:46 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-18 11:34:46 -0800 |
commit | d4715aa246786ee68b93d9eaef948fa4772b8fd8 (patch) | |
tree | 616c1fe17f77b10f8bdbd520c4b06af4f08ede96 /src/com/android/gallery3d/filtershow/PanelController.java | |
parent | f6bc102ca181ebe3064aa211b736de213a5d31e2 (diff) | |
parent | 5b188c94f5895cd166fc29def1e5295498e298c9 (diff) | |
download | android_packages_apps_Gallery2-d4715aa246786ee68b93d9eaef948fa4772b8fd8.tar.gz android_packages_apps_Gallery2-d4715aa246786ee68b93d9eaef948fa4772b8fd8.tar.bz2 android_packages_apps_Gallery2-d4715aa246786ee68b93d9eaef948fa4772b8fd8.zip |
am 5b188c94: Disabled further filters after Tiny Planet.
* commit '5b188c94f5895cd166fc29def1e5295498e298c9':
Disabled further filters after Tiny Planet.
Diffstat (limited to 'src/com/android/gallery3d/filtershow/PanelController.java')
-rw-r--r-- | src/com/android/gallery3d/filtershow/PanelController.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index 52bf98aa7..e92c54936 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -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: { |