summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/layout-land/filtershow_editor_panel.xml3
-rw-r--r--res/layout/filtershow_seekbar.xml3
-rw-r--r--src/com/android/gallery3d/filtershow/editors/Editor.java8
-rw-r--r--src/com/android/gallery3d/filtershow/editors/EditorCurves.java6
4 files changed, 11 insertions, 9 deletions
diff --git a/res/layout-land/filtershow_editor_panel.xml b/res/layout-land/filtershow_editor_panel.xml
index fc3246826..cafafde1b 100644
--- a/res/layout-land/filtershow_editor_panel.xml
+++ b/res/layout-land/filtershow_editor_panel.xml
@@ -117,7 +117,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- style="@style/FilterShowSlider"/>
+ style="@style/FilterShowSlider"
+ android:visibility="gone"/>
</LinearLayout>
diff --git a/res/layout/filtershow_seekbar.xml b/res/layout/filtershow_seekbar.xml
index 6463ca8e1..54a874d07 100644
--- a/res/layout/filtershow_seekbar.xml
+++ b/res/layout/filtershow_seekbar.xml
@@ -26,6 +26,7 @@
android:id="@+id/primarySeekBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/FilterShowSlider" />
+ style="@style/FilterShowSlider"
+ android:visibility="gone" />
</LinearLayout>
diff --git a/src/com/android/gallery3d/filtershow/editors/Editor.java b/src/com/android/gallery3d/filtershow/editors/Editor.java
index 5651970af..c0d499c65 100644
--- a/src/com/android/gallery3d/filtershow/editors/Editor.java
+++ b/src/com/android/gallery3d/filtershow/editors/Editor.java
@@ -117,13 +117,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
R.layout.filtershow_seekbar, (ViewGroup) editControl, true);
mSeekBar = (SeekBar) lp.findViewById(R.id.primarySeekBar);
mSeekBar.setOnSeekBarChangeListener(this);
-
- if (showsSeekBar()) {
- mSeekBar.setOnSeekBarChangeListener(this);
- mSeekBar.setVisibility(View.VISIBLE);
- } else {
- mSeekBar.setVisibility(View.INVISIBLE);
- }
+ mSeekBar.setVisibility(View.GONE);
if (mButton != null) {
if (showsPopupIndicator()) {
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorCurves.java b/src/com/android/gallery3d/filtershow/editors/EditorCurves.java
index 83fbced79..c9f57f418 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorCurves.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorCurves.java
@@ -30,6 +30,12 @@ public class EditorCurves extends Editor {
public EditorCurves() {
super(ID);
+ int k =R.menu.filtershow_menu_curves;
+ }
+
+ @Override
+ protected void updateText() {
+
}
@Override