diff options
| author | Yuli Huang <yuli@google.com> | 2011-10-06 18:11:50 +0800 |
|---|---|---|
| committer | Yuli Huang <yuli@google.com> | 2011-10-06 18:11:50 +0800 |
| commit | f2ff1ad51c57308f282473f7b9e47c454172bfca (patch) | |
| tree | 586fd7c3c33314a369a52a763617588d8f557298 /src | |
| parent | 7051cc97f1098ff9c23ed02e0b6fe2088c8d1e98 (diff) | |
| download | android_packages_apps_Gallery2-f2ff1ad51c57308f282473f7b9e47c454172bfca.tar.gz android_packages_apps_Gallery2-f2ff1ad51c57308f282473f7b9e47c454172bfca.tar.bz2 android_packages_apps_Gallery2-f2ff1ad51c57308f282473f7b9e47c454172bfca.zip | |
Replace slider assets and fix save-share-button height.
1. Use the same slider asset for both fill-light and highlights.
2. Update slider assets and dimensions.
3. Fix save-share-button height didn't fill action-bar.
Change-Id: I6b3a735c8f745084b89b1d6a035c7ed9bd4ff287
Diffstat (limited to 'src')
3 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java b/src/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java index 4bc49c5fe..2c697351d 100644 --- a/src/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java +++ b/src/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java @@ -29,7 +29,7 @@ import com.android.gallery3d.photoeditor.PhotoView; public class EffectToolFactory { public enum ScalePickerType { - FILLLIGHT, HIGHLIGHT, SHADOW, COLOR, GENERIC + LIGHT, SHADOW, COLOR, GENERIC } private final ViewGroup effectToolPanel; @@ -59,11 +59,8 @@ public class EffectToolFactory { private int getScalePickerBackground(ScalePickerType type) { switch (type) { - case FILLLIGHT: - return R.drawable.photoeditor_scale_seekbar_filllight; - - case HIGHLIGHT: - return R.drawable.photoeditor_scale_seekbar_highlight; + case LIGHT: + return R.drawable.photoeditor_scale_seekbar_light; case SHADOW: return R.drawable.photoeditor_scale_seekbar_shadow; diff --git a/src/com/android/gallery3d/photoeditor/actions/FillLightAction.java b/src/com/android/gallery3d/photoeditor/actions/FillLightAction.java index e5a743c00..962486bbf 100644 --- a/src/com/android/gallery3d/photoeditor/actions/FillLightAction.java +++ b/src/com/android/gallery3d/photoeditor/actions/FillLightAction.java @@ -38,7 +38,7 @@ public class FillLightAction extends EffectAction { public void doBegin() { final FillLightFilter filter = new FillLightFilter(); - scalePicker = factory.createScalePicker(EffectToolFactory.ScalePickerType.FILLLIGHT); + scalePicker = factory.createScalePicker(EffectToolFactory.ScalePickerType.LIGHT); scalePicker.setOnScaleChangeListener(new ScaleSeekBar.OnScaleChangeListener() { @Override diff --git a/src/com/android/gallery3d/photoeditor/actions/HighlightAction.java b/src/com/android/gallery3d/photoeditor/actions/HighlightAction.java index 06feedcb9..cd8f4b278 100644 --- a/src/com/android/gallery3d/photoeditor/actions/HighlightAction.java +++ b/src/com/android/gallery3d/photoeditor/actions/HighlightAction.java @@ -38,7 +38,7 @@ public class HighlightAction extends EffectAction { public void doBegin() { final HighlightFilter filter = new HighlightFilter(); - scalePicker = factory.createScalePicker(EffectToolFactory.ScalePickerType.HIGHLIGHT); + scalePicker = factory.createScalePicker(EffectToolFactory.ScalePickerType.LIGHT); scalePicker.setOnScaleChangeListener(new ScaleSeekBar.OnScaleChangeListener() { @Override |