summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-09-18 10:23:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-18 10:23:31 -0700
commit69dded593801a19a646fa970e64555c661355e8f (patch)
tree226a9d9fb52c11df1b695ae94f4cc10fce8a84bd /src
parent89746d6be516b079a7f5ae5a20925275e746e2e2 (diff)
parent99d3506cdfce8d13e4e0c0d1b6ec1e15c2ff765a (diff)
downloadandroid_packages_apps_Gallery2-69dded593801a19a646fa970e64555c661355e8f.tar.gz
android_packages_apps_Gallery2-69dded593801a19a646fa970e64555c661355e8f.tar.bz2
android_packages_apps_Gallery2-69dded593801a19a646fa970e64555c661355e8f.zip
am 99d3506c: am b3d3894e: am 9029a469: fix grad filter brightness value stuck at -100
* commit '99d3506cdfce8d13e4e0c0d1b6ec1e15c2ff765a': fix grad filter brightness value stuck at -100
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/editors/EditorGrad.java3
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorGrad.java b/src/com/android/gallery3d/filtershow/editors/EditorGrad.java
index 4be435f8c..80c430379 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorGrad.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorGrad.java
@@ -191,13 +191,13 @@ public class EditorGrad extends ParametricEditor
public ParamAdapter(int seekId, int textId, LinearLayout layout, int mode) {
mSlider = (SeekBar) layout.findViewById(seekId);
mTextView = (TextView) layout.findViewById(textId);
- mSlider.setOnSeekBarChangeListener(this);
mSlider.setMax(mMax - mMin);
mMode = mode;
FilterGradRepresentation rep = getGradRepresentation();
if (rep != null){
updateValues(rep);
}
+ mSlider.setOnSeekBarChangeListener(this);
}
public void updateValues(FilterGradRepresentation rep) {
@@ -428,5 +428,4 @@ public class EditorGrad extends ParametricEditor
public void copyFrom(Parameter src) {
}
-
}
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
index 354fa5925..a3a7e9555 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
@@ -114,7 +114,7 @@ public class FilterGradRepresentation extends FilterRepresentation
p.yPos1 = 100;
p.xPos2 = -1;
p.yPos2 = 100;
- p.brightness = 40;
+ p.brightness = -50;
p.contrast = 0;
p.saturation = 0;
mBands.add(0, p);