summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2012-12-13 23:18:19 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-12-13 23:18:19 -0800
commita0e4fb160e5e8e66f4e749933824d127d725f0aa (patch)
tree4176d45d2217d4dae3e5f8d6451025cf962ec4a5 /src
parentdc5dddc441e8445f3ac22d084175942229c253cf (diff)
parentf4d3a216361375f1ad846bfb88fba66b014d2901 (diff)
downloadandroid_packages_apps_Snap-a0e4fb160e5e8e66f4e749933824d127d725f0aa.tar.gz
android_packages_apps_Snap-a0e4fb160e5e8e66f4e749933824d127d725f0aa.tar.bz2
android_packages_apps_Snap-a0e4fb160e5e8e66f4e749933824d127d725f0aa.zip
Merge "Refactoring: removed unused presets." into gb-ub-photos-bryce
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePresetFX.java45
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePresetOld.java38
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java35
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePresetXProcessing.java39
4 files changed, 0 insertions, 157 deletions
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePresetFX.java b/src/com/android/gallery3d/filtershow/presets/ImagePresetFX.java
deleted file mode 100644
index 95edc5d15..000000000
--- a/src/com/android/gallery3d/filtershow/presets/ImagePresetFX.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2012 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.filtershow.presets;
-
-import android.graphics.Bitmap;
-
-import com.android.gallery3d.filtershow.filters.ImageFilterFx;
-
-public class ImagePresetFX extends ImagePreset {
- String name;
- Bitmap fxBitmap;
-
- @Override
- public String name() {
- return name;
- }
-
- public ImagePresetFX(Bitmap bitmap, String name) {
- fxBitmap = bitmap;
- this.name = name;
- setup();
- }
-
- @Override
- public void setup() {
- if (fxBitmap != null) {
- mFilters.add(new ImageFilterFx(fxBitmap,name));
- }
- }
-
-}
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePresetOld.java b/src/com/android/gallery3d/filtershow/presets/ImagePresetOld.java
deleted file mode 100644
index 5e1db8336..000000000
--- a/src/com/android/gallery3d/filtershow/presets/ImagePresetOld.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2012 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.filtershow.presets;
-
-import android.graphics.Color;
-
-import com.android.gallery3d.filtershow.filters.ImageFilterGradient;
-
-public class ImagePresetOld extends ImagePreset {
-
- @Override
- public String name() {
- return "Old";
- }
-
- @Override
- public void setup() {
- ImageFilterGradient filter = new ImageFilterGradient();
- filter.addColor(Color.BLACK, 0.0f);
- filter.addColor(Color.argb(255, 228, 231, 193), 1.0f);
- mFilters.add(filter);
- }
-
-}
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java b/src/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
deleted file mode 100644
index ddfca7508..000000000
--- a/src/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2012 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.filtershow.presets;
-
-import com.android.gallery3d.filtershow.filters.ImageFilterSaturated;
-
-public class ImagePresetSaturated extends ImagePreset {
-
- @Override
- public String name() {
- return "Saturated";
- }
-
- @Override
- public void setup() {
- ImageFilterSaturated filter = new ImageFilterSaturated();
- filter.setParameter(50);
- mFilters.add(filter);
- }
-
-}
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePresetXProcessing.java b/src/com/android/gallery3d/filtershow/presets/ImagePresetXProcessing.java
deleted file mode 100644
index 7957b5e7c..000000000
--- a/src/com/android/gallery3d/filtershow/presets/ImagePresetXProcessing.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2012 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.filtershow.presets;
-
-import android.graphics.Color;
-
-import com.android.gallery3d.filtershow.filters.ImageFilterGradient;
-
-public class ImagePresetXProcessing extends ImagePreset {
-
- @Override
- public String name() {
- return "X-Process";
- }
-
- @Override
- public void setup() {
- ImageFilterGradient filter = new ImageFilterGradient();
- filter.addColor(Color.BLACK, 0.0f);
- filter.addColor(Color.argb(255, 29, 82, 83), 0.4f);
- filter.addColor(Color.argb(255, 211, 217, 186), 1.0f);
- mFilters.add(filter);
- }
-
-}