diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-17 08:33:02 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-17 08:33:02 -0800 |
commit | 5c273aab9d380d588d867122fb729cccffef86c2 (patch) | |
tree | 63e35e3432dd4f36c0c2dcd1382ee81ae32ff4df /src | |
parent | 38758bc085194faf24e4ea160b04ef138f3917a1 (diff) | |
parent | 63581873a606fdaad3c9667c4d07908b9d7954c3 (diff) | |
download | android_packages_apps_Gallery2-5c273aab9d380d588d867122fb729cccffef86c2.tar.gz android_packages_apps_Gallery2-5c273aab9d380d588d867122fb729cccffef86c2.tar.bz2 android_packages_apps_Gallery2-5c273aab9d380d588d867122fb729cccffef86c2.zip |
Merge "Gallery2: Fix color chooser"
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/gallery3d/filtershow/controller/ColorChooser.java | 9 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/controller/ColorChooser.java b/src/com/android/gallery3d/filtershow/controller/ColorChooser.java index f9f29bccc..82ce80bbf 100644 --- a/src/com/android/gallery3d/filtershow/controller/ColorChooser.java +++ b/src/com/android/gallery3d/filtershow/controller/ColorChooser.java @@ -68,9 +68,16 @@ public class ColorChooser implements Control { Color.colorToHSV(palette[i], hsvo); hsvo[OPACITY_OFFSET] = (0xFF & (palette[i] >> 24)) / (float) 255; button.setTag(hsvo); + + String colorString = "(" + Integer.toHexString(palette[i]) + ")"; + boolean colorSelect = false; + if (parameter.getValueString().equals(colorString)) { + mSelectedButton = i; + colorSelect = true; + } GradientDrawable sd = ((GradientDrawable) button.getBackground()); sd.setColor(palette[i]); - sd.setStroke(3, (mSelectedButton == i) ? mSelected : mTransparent); + sd.setStroke(3, colorSelect? mSelected : mTransparent); final int buttonNo = i; button.setOnClickListener(new View.OnClickListener() { diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java index 48d3d9077..275a40409 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java @@ -166,6 +166,11 @@ public class FilterDrawRepresentation extends FilterRepresentation { setEditorId(EditorDraw.ID); setOverlayId(R.drawable.filtershow_drawing); setOverlayOnly(true); + setDefaultColor(); + } + + private void setDefaultColor() { + mParamColor.setValue(DEFAULT_MENU_COLOR1); } @Override |