Merge "Refresh parameters during recording." into gb-ub-photos-bryce
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 81c1717..b659432 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -133,6 +133,7 @@
private FilterIconButton mNullBorderFilter;
private int mIconSeedSize = 140;
+ private View mImageCategoryPanel = null;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -219,6 +220,16 @@
setupHistoryPanel();
setupStatePanel();
+
+ mImageCategoryPanel = findViewById(R.id.imageCategoryPanel);
+ }
+
+ public void hideCategoryPanel() {
+ mImageCategoryPanel.setVisibility(View.GONE);
+ }
+
+ public void showCategoryPanel() {
+ mImageCategoryPanel.setVisibility(View.VISIBLE);
}
public void setupHistoryPanel() {
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 6b20fe1..f29765a 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -31,6 +31,7 @@
import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.editors.Editor;
import com.android.gallery3d.filtershow.editors.EditorTinyPlanet;
+import com.android.gallery3d.filtershow.editors.ImageOnlyEditor;
import com.android.gallery3d.filtershow.filters.FilterRepresentation;
import com.android.gallery3d.filtershow.filters.ImageFilter;
import com.android.gallery3d.filtershow.filters.ImageFilterTinyPlanet;
@@ -369,6 +370,7 @@
HistoryAdapter adapter = MasterImage.getImage().getHistory();
int position = adapter.undo();
MasterImage.getImage().onHistoryItemClick(position);
+ mActivity.showCategoryPanel();
showPanel(mCurrentPanel);
mCurrentImage.select();
if (mCurrentEditor != null) {
@@ -586,6 +588,7 @@
}
mUtilityPanel.hideAccessoryViews();
mUtilityPanel.showMenu(false);
+
if (view instanceof FilterIconButton) {
mCurrentEditor = null;
FilterIconButton component = (FilterIconButton) view;
@@ -595,6 +598,9 @@
mUtilityPanel.setShowParameter(representation.showParameterValue());
if (representation.getEditorId() != 0) {
+ if (representation.getEditorId() != ImageOnlyEditor.ID) {
+ mActivity.hideCategoryPanel();
+ }
if (mEditorPlaceHolder.contains(representation.getEditorId())) {
mCurrentEditor = mEditorPlaceHolder.showEditor(
representation.getEditorId());
@@ -625,6 +631,7 @@
return;
}
+ mActivity.showCategoryPanel();
int id = view.getId();
if (id == EditorTinyPlanet.ID) {
mCurrentImage = showImageView(R.id.imageTinyPlanet);