summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/FilterShowActivity.java
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-02-08 14:37:35 -0800
committerJohn Hoford <hoford@google.com>2013-02-08 14:53:46 -0800
commitb4e6733731e751afe7dcf2a3b9803d2f720cb253 (patch)
treeb4bbe06d702f9a4d91de3efb3858f8841e7dcfd5 /src/com/android/gallery3d/filtershow/FilterShowActivity.java
parent0606108a8126b357772db415ad4517395fce8875 (diff)
downloadandroid_packages_apps_Snap-b4e6733731e751afe7dcf2a3b9803d2f720cb253.tar.gz
android_packages_apps_Snap-b4e6733731e751afe7dcf2a3b9803d2f720cb253.tar.bz2
android_packages_apps_Snap-b4e6733731e751afe7dcf2a3b9803d2f720cb253.zip
remove slider from FX and Border UI
Change-Id: Ic1c38734c4351ab0150b90d5d4fc575cce9db9e9
Diffstat (limited to 'src/com/android/gallery3d/filtershow/FilterShowActivity.java')
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 1b7408f62..051ffaf4a 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -64,6 +64,7 @@ import com.android.gallery3d.filtershow.cache.ImageLoader;
import com.android.gallery3d.filtershow.editors.BasicEditor;
import com.android.gallery3d.filtershow.editors.EditorDraw;
import com.android.gallery3d.filtershow.editors.EditorManager;
+import com.android.gallery3d.filtershow.editors.ImageOnlyEditor;
import com.android.gallery3d.filtershow.filters.*;
import com.android.gallery3d.filtershow.imageshow.ImageCrop;
import com.android.gallery3d.filtershow.imageshow.ImageDraw;
@@ -223,6 +224,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
mEditorPlaceHolder.setContainer((FrameLayout) findViewById(R.id.editorContainer));
mEditorPlaceHolder.addEditor(new EditorDraw());
mEditorPlaceHolder.addEditor(new BasicEditor());
+ mEditorPlaceHolder.addEditor(new ImageOnlyEditor());
EditorManager.addEditors(mEditorPlaceHolder);
mEditorPlaceHolder.setOldViews(mImageViews);
mEditorPlaceHolder.setImageLoader(mImageLoader);
@@ -305,11 +307,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
LoadBordersTask loadBorders = new LoadBordersTask(listBorders);
loadBorders.execute();
- SeekBar seekBar = (SeekBar) findViewById(R.id.filterSeekBar);
- seekBar.setMax(SEEK_BAR_MAX);
-
- mImageShow.setSeekBar(seekBar);
- mImageTinyPlanet.setSeekBar(seekBar);
mPanelController.setRowPanel(findViewById(R.id.secondRowPanel));
mPanelController.setUtilityPanel(this, findViewById(R.id.filterButtonsList),
findViewById(R.id.panelAccessoryViewList),