Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad (c58ff057) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/filtershow/state/StatePanel.java

+13 −8

Original line number	Diff line number	Diff line
		@@ -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,6 +50,7 @@ public class StatePanel extends Fragment {
		track = (StatePanelTrack) panel;
		track.setAdapter(MasterImage.getImage().getState());
		mToggleVersionsPanel = (ImageButton) mMainView.findViewById(R.id.toggleVersionsPanel);
		if (FilterShowHelper.shouldUseVersions()) {
		if (mToggleVersionsPanel.getVisibility() == View.GONE
		\|\| mToggleVersionsPanel.getVisibility() == View.INVISIBLE) {
		mToggleVersionsPanel.setVisibility(View.VISIBLE);
		@@ -59,6 +61,9 @@ public class StatePanel extends Fragment {
		} else if (mToggleVersionsPanel != null) {
		mToggleVersionsPanel.setVisibility(View.GONE);
		}
		} else {
		mToggleVersionsPanel.setVisibility(View.GONE);
		}
		return mMainView;
		}
		}

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		/*
		* 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;
		}
		}