diff options
author | John Hoford <hoford@google.com> | 2012-10-01 17:21:55 -0700 |
---|---|---|
committer | John Hoford <hoford@google.com> | 2012-10-01 17:47:50 -0700 |
commit | aab2640d1eec784f75fea0b4c8bb2ea4fb4325fd (patch) | |
tree | 6b49b7bc946ae2e4b40f06f2e913073652a0a1d5 /src/com/android | |
parent | db61fdf195283c18b9dfbc523fced2358b437008 (diff) | |
download | android_packages_apps_Snap-aab2640d1eec784f75fea0b4c8bb2ea4fb4325fd.tar.gz android_packages_apps_Snap-aab2640d1eec784f75fea0b4c8bb2ea4fb4325fd.tar.bz2 android_packages_apps_Snap-aab2640d1eec784f75fea0b4c8bb2ea4fb4325fd.zip |
Fix exposure and fixed warnings
bug:7234321
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 6 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java (renamed from src/com/android/gallery3d/filtershow/filters/ImageFilterBrightness.java) | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index eb95d7452..4570eb017 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -753,14 +753,14 @@ public class FilterShowActivity extends Activity implements OnItemClickListener mImageShow.setVisibility(View.VISIBLE); mImageShow.setShowControls(true); ImagePreset preset = mImageShow.getImagePreset(); - ImageFilter filter = preset.getFilter("Brightness"); + ImageFilter filter = preset.getFilter("Exposure"); if (filter == null) { - ImageFilterBrightness bright = new ImageFilterBrightness(); + ImageFilterExposure bright = new ImageFilterExposure(); ImagePreset copy = new ImagePreset(preset); copy.add(bright); copy.setHistoryName(bright.getName()); copy.setIsFx(false); - filter = copy.getFilter("Brightness"); + filter = copy.getFilter("Exposure"); mImageShow.setImagePreset(copy); } mImageShow.setCurrentFilter(filter); diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterBrightness.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java index ab61a00c2..85b6e4f6b 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterBrightness.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java @@ -3,14 +3,15 @@ package com.android.gallery3d.filtershow.filters; import android.graphics.Bitmap; -public class ImageFilterBrightness extends ImageFilter { +public class ImageFilterExposure extends ImageFilter { - public ImageFilterBrightness() { - mName = "Brightness"; + public ImageFilterExposure() { + mName = "Exposure"; } native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, float bright); + @Override public void apply(Bitmap bitmap) { int w = bitmap.getWidth(); int h = bitmap.getHeight(); |