Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches

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();