diff options
Diffstat (limited to 'src/com/android/gallery3d/filtershow/presets')
9 files changed, 2 insertions, 291 deletions
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index 8943f30de..2522c8966 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -181,7 +181,7 @@ public class ImagePreset { return false; } - if (mImageBorder != preset.mImageBorder) { + if (mDoApplyGeometry && mImageBorder != preset.mImageBorder) { return false; } @@ -292,7 +292,7 @@ public class ImagePreset { } } - if (mImageBorder != null) { + if (mImageBorder != null && mDoApplyGeometry) { bitmap = mImageBorder.apply(bitmap, mScaleFactor, mIsHighQuality); } diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePresetBW.java b/src/com/android/gallery3d/filtershow/presets/ImagePresetBW.java deleted file mode 100644 index bfa6dacc7..000000000 --- a/src/com/android/gallery3d/filtershow/presets/ImagePresetBW.java +++ /dev/null @@ -1,33 +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.ImageFilterBW; - -public class ImagePresetBW extends ImagePreset { - - @Override - public String name() { - return "B&W"; - } - - @Override - public void setup() { - mFilters.add(new ImageFilterBW()); - } - -} diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java b/src/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java deleted file mode 100644 index 5d56aa1cd..000000000 --- a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java +++ /dev/null @@ -1,33 +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.ImageFilterBWBlue; - -public class ImagePresetBWBlue extends ImagePreset { - - @Override - public String name() { - return "B&W - Blue"; - } - - @Override - public void setup() { - mFilters.add(new ImageFilterBWBlue()); - } - -} diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java b/src/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java deleted file mode 100644 index d1b4e5d78..000000000 --- a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java +++ /dev/null @@ -1,33 +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.ImageFilterBWGreen; - -public class ImagePresetBWGreen extends ImagePreset { - - @Override - public String name() { - return "B&W - Green"; - } - - @Override - public void setup() { - mFilters.add(new ImageFilterBWGreen()); - } - -} diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java b/src/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java deleted file mode 100644 index 9653bed57..000000000 --- a/src/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java +++ /dev/null @@ -1,33 +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.ImageFilterBWRed; - -public class ImagePresetBWRed extends ImagePreset { - - @Override - public String name() { - return "B&W - Red"; - } - - @Override - public void setup() { - mFilters.add(new ImageFilterBWRed()); - } - -} 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); - } - -} |