diff options
author | Yuli Huang <yuli@google.com> | 2011-09-12 22:25:30 +0800 |
---|---|---|
committer | Yuli Huang <yuli@google.com> | 2011-09-13 00:36:00 +0800 |
commit | 6a12ad70df5da5052a8381e2cdda79e6a314cee9 (patch) | |
tree | 11a4d3a11c110af87e808b5a1845e41aefd5ac5a /src/com/android/gallery3d/photoeditor/actions/SaturationAction.java | |
parent | 2c704be3f593ece6ef5b96ff166f126f4afc9d23 (diff) | |
download | android_packages_apps_Gallery2-6a12ad70df5da5052a8381e2cdda79e6a314cee9.tar.gz android_packages_apps_Gallery2-6a12ad70df5da5052a8381e2cdda79e6a314cee9.tar.bz2 android_packages_apps_Gallery2-6a12ad70df5da5052a8381e2cdda79e6a314cee9.zip |
Fix b/4643148: Make PhotoEditor integrated into Gallery.
1. Move PhotoEditor code/resources into Gallery for single apk.
2. Change PhotoEditor package to com.android.gallery3d.photoeditor.
3. Rename PhotoEditor resources to avoid mess up Gallery resources.
4. Move Doodle effect from fix-effects to color-effects.
5. Update PhotoEditor bottom action-bar background.
Change-Id: I1a2f7d27d89a14fe6a0435575b993ed8b75e6bf4
Diffstat (limited to 'src/com/android/gallery3d/photoeditor/actions/SaturationAction.java')
-rw-r--r-- | src/com/android/gallery3d/photoeditor/actions/SaturationAction.java | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/photoeditor/actions/SaturationAction.java b/src/com/android/gallery3d/photoeditor/actions/SaturationAction.java new file mode 100644 index 000000000..31bcfd664 --- /dev/null +++ b/src/com/android/gallery3d/photoeditor/actions/SaturationAction.java @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2010 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.photoeditor.actions; + +import android.content.Context; +import android.util.AttributeSet; + +import com.android.gallery3d.photoeditor.filters.SaturationFilter; + +/** + * An action handling saturation effect. + */ +public class SaturationAction extends EffectAction { + + private static final float DEFAULT_SCALE = 0.5f; + + private ScaleSeekBar scalePicker; + + public SaturationAction(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + public void doBegin() { + final SaturationFilter filter = new SaturationFilter(); + + scalePicker = factory.createScalePicker(EffectToolFactory.ScalePickerType.COLOR); + scalePicker.setOnScaleChangeListener(new ScaleSeekBar.OnScaleChangeListener() { + + @Override + public void onProgressChanged(float progress, boolean fromUser) { + if (fromUser) { + filter.setSaturation(progress); + notifyFilterChanged(filter, true); + } + } + }); + scalePicker.setProgress(DEFAULT_SCALE); + } + + @Override + public void doEnd() { + scalePicker.setOnScaleChangeListener(null); + } +} |