diff options
author | John Hoford <hoford@google.com> | 2013-02-16 09:20:59 -0800 |
---|---|---|
committer | John Hoford <hoford@google.com> | 2013-02-19 15:25:43 -0800 |
commit | 5c2a3041de052ae94cd8b884173bb09c3f60fd4e (patch) | |
tree | 40dfffe8c939c809796d17128ddba6a5f3035991 | |
parent | 556a4230de3ea7ff5c506c4d12de1367db1d89db (diff) | |
download | android_packages_apps_Snap-5c2a3041de052ae94cd8b884173bb09c3f60fd4e.tar.gz android_packages_apps_Snap-5c2a3041de052ae94cd8b884173bb09c3f60fd4e.tar.bz2 android_packages_apps_Snap-5c2a3041de052ae94cd8b884173bb09c3f60fd4e.zip |
add movable vignette
Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d
-rw-r--r-- | res/layout/filtershow_vignette_editor.xml | 46 | ||||
-rw-r--r-- | res/values/filtershow_ids.xml | 1 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java | 114 |
3 files changed, 161 insertions, 0 deletions
diff --git a/res/layout/filtershow_vignette_editor.xml b/res/layout/filtershow_vignette_editor.xml new file mode 100644 index 000000000..6e5755928 --- /dev/null +++ b/res/layout/filtershow_vignette_editor.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013 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. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:iconbutton="http://schemas.android.com/apk/res/com.android.gallery3d" + android:id="@+id/tinyPlanetEditor" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" > + + <com.android.gallery3d.filtershow.imageshow.ImageVignette + android:id="@+id/imageVignette" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <com.android.gallery3d.filtershow.CenteredLinearLayout + xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal|bottom" + android:background="@android:color/transparent" + custom:max_width="600dip" + android:orientation="vertical"> + + <SeekBar + android:id="@+id/filterSeekBar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:padding="16dip"/> + </com.android.gallery3d.filtershow.CenteredLinearLayout> + </FrameLayout>
\ No newline at end of file diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml index 786d7ee7d..ba318345b 100644 --- a/res/values/filtershow_ids.xml +++ b/res/values/filtershow_ids.xml @@ -40,4 +40,5 @@ <item type="id" name="editorDraw" /> <item type="id" name="editorRedEye" /> <item type="id" name="imageOnlyEditor" /> + <item type="id" name="vignetteEditor" /> </resources> diff --git a/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java new file mode 100644 index 000000000..eef54ef58 --- /dev/null +++ b/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java @@ -0,0 +1,114 @@ +/* + * 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.filters; + +import com.android.gallery3d.R; +import com.android.gallery3d.filtershow.editors.EditorVignette; +import com.android.gallery3d.filtershow.imageshow.Oval; + +public class FilterVignetteRepresentation extends FilterBasicRepresentation implements Oval { + private static final String LOGTAG = "FilterVignetteRepresentation"; + private float mCenterX = Float.NaN; + private float mCenterY; + private float mRadiusX = Float.NaN; + private float mRadiusY; + + public FilterVignetteRepresentation() { + super("Vignette", -100, 50, 100); + setShowParameterValue(true); + setPriority(FilterRepresentation.TYPE_VIGNETTE); + setTextId(R.string.vignette); + setButtonId(R.id.vignetteEditor); + setEditorId(EditorVignette.ID); + setName("Vignette"); + setFilterClass(ImageFilterVignette.class); + + setMinimum(-100); + setMaximum(100); + setDefaultValue(0); + } + + @Override + public void useParametersFrom(FilterRepresentation a) { + super.useParametersFrom(a); + mCenterX = ((FilterVignetteRepresentation) a).mCenterX; + mCenterY = ((FilterVignetteRepresentation) a).mCenterY; + mRadiusX = ((FilterVignetteRepresentation) a).mRadiusX; + mRadiusY = ((FilterVignetteRepresentation) a).mRadiusY; + } + + @Override + public FilterRepresentation clone() throws CloneNotSupportedException { + FilterVignetteRepresentation representation = (FilterVignetteRepresentation) super + .clone(); + representation.mCenterX = mCenterX; + representation.mCenterY = mCenterY; + + return representation; + } + + @Override + public void setCenter(float centerX, float centerY) { + mCenterX = centerX; + mCenterY = centerY; + } + + @Override + public float getCenterX() { + return mCenterX; + } + + @Override + public float getCenterY() { + return mCenterY; + } + + @Override + public void setRadius(float radiusX, float radiusY) { + mRadiusX = radiusX; + mRadiusY = radiusY; + } + + @Override + public void setRadiusX(float radiusX) { + mRadiusX = radiusX; + } + + @Override + public void setRadiusY(float radiusY) { + mRadiusY = radiusY; + } + + @Override + public float getRadiusX() { + return mRadiusX; + } + + @Override + public float getRadiusY() { + return mRadiusY; + } + + public boolean isCenterSet() { + return mCenterX != Float.NaN; + } + + @Override + public boolean isNil() { + return getValue() == 0; + } +} |