diff options
| -rw-r--r-- | src/com/android/gallery3d/filtershow/state/StatePanel.java | 21 | ||||
| -rw-r--r-- | src_pd/com/android/gallery3d/util/FilterShowHelper.java | 27 |
2 files changed, 40 insertions, 8 deletions
diff --git a/src/com/android/gallery3d/filtershow/state/StatePanel.java b/src/com/android/gallery3d/filtershow/state/StatePanel.java index 8f0c69ec5..95c2df991 100644 --- a/src/com/android/gallery3d/filtershow/state/StatePanel.java +++ b/src/com/android/gallery3d/filtershow/state/StatePanel.java @@ -27,6 +27,7 @@ import android.widget.LinearLayout; import com.android.gallery3d.R; import com.android.gallery3d.filtershow.category.MainPanel; import com.android.gallery3d.filtershow.imageshow.MasterImage; +import com.android.gallery3d.util.FilterShowHelper; public class StatePanel extends Fragment { private static final String LOGTAG = "StatePanel"; @@ -49,14 +50,18 @@ public class StatePanel extends Fragment { track = (StatePanelTrack) panel; track.setAdapter(MasterImage.getImage().getState()); mToggleVersionsPanel = (ImageButton) mMainView.findViewById(R.id.toggleVersionsPanel); - if (mToggleVersionsPanel.getVisibility() == View.GONE - || mToggleVersionsPanel.getVisibility() == View.INVISIBLE) { - mToggleVersionsPanel.setVisibility(View.VISIBLE); - mToggleVersionsPanel.setImageBitmap(null); - } - if (mMainPanel != null) { - mMainPanel.setToggleVersionsPanelButton(mToggleVersionsPanel); - } else if (mToggleVersionsPanel != null) { + if (FilterShowHelper.shouldUseVersions()) { + if (mToggleVersionsPanel.getVisibility() == View.GONE + || mToggleVersionsPanel.getVisibility() == View.INVISIBLE) { + mToggleVersionsPanel.setVisibility(View.VISIBLE); + mToggleVersionsPanel.setImageBitmap(null); + } + if (mMainPanel != null) { + mMainPanel.setToggleVersionsPanelButton(mToggleVersionsPanel); + } else if (mToggleVersionsPanel != null) { + mToggleVersionsPanel.setVisibility(View.GONE); + } + } else { mToggleVersionsPanel.setVisibility(View.GONE); } return mMainView; diff --git a/src_pd/com/android/gallery3d/util/FilterShowHelper.java b/src_pd/com/android/gallery3d/util/FilterShowHelper.java new file mode 100644 index 000000000..b30ebac8a --- /dev/null +++ b/src_pd/com/android/gallery3d/util/FilterShowHelper.java @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.gallery3d.util; + +public class FilterShowHelper { + + /** + * Whether to utilize version info in editor. + */ + public static final boolean shouldUseVersions() { + return true; + } +} |