summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/editors
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-04-29 07:30:33 -0700
committerJohn Hoford <hoford@google.com>2013-04-29 14:29:25 -0700
commit027c2681e8075dda5c83088532ac1f55d20130fd (patch)
treef57eb463985563af64bb27dd5a0e96c771fab02e /src/com/android/gallery3d/filtershow/editors
parent31eef2d6d3e4c72bf168b931c5123ed739401b99 (diff)
downloadandroid_packages_apps_Snap-027c2681e8075dda5c83088532ac1f55d20130fd.tar.gz
android_packages_apps_Snap-027c2681e8075dda5c83088532ac1f55d20130fd.tar.bz2
android_packages_apps_Snap-027c2681e8075dda5c83088532ac1f55d20130fd.zip
small ui changes based on UX/PM feedback
bug:8664728 Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043
Diffstat (limited to 'src/com/android/gallery3d/filtershow/editors')
-rw-r--r--src/com/android/gallery3d/filtershow/editors/BasicEditor.java1
-rw-r--r--src/com/android/gallery3d/filtershow/editors/Editor.java2
-rw-r--r--src/com/android/gallery3d/filtershow/editors/EditorStraighten.java2
-rw-r--r--src/com/android/gallery3d/filtershow/editors/ParametricEditor.java6
4 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
index 44296e2ef..af694d811 100644
--- a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
+++ b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
@@ -51,6 +51,7 @@ public class BasicEditor extends ParametricEditor implements ParameterInteger {
super.reflectCurrentFilter();
if (getLocalRepresentation() != null && getLocalRepresentation() instanceof FilterBasicRepresentation) {
FilterBasicRepresentation interval = (FilterBasicRepresentation) getLocalRepresentation();
+ updateText();
}
}
diff --git a/src/com/android/gallery3d/filtershow/editors/Editor.java b/src/com/android/gallery3d/filtershow/editors/Editor.java
index b543750f3..e760ae58c 100644
--- a/src/com/android/gallery3d/filtershow/editors/Editor.java
+++ b/src/com/android/gallery3d/filtershow/editors/Editor.java
@@ -60,7 +60,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
public static byte SHOW_VALUE_INT = 1;
public String calculateUserMessage(Context context, String effectName, Object parameterValue) {
- return effectName + " " + parameterValue;
+ return effectName.toUpperCase() + " " + parameterValue;
}
protected Editor(int id) {
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java b/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java
index 4c071dc69..dbc6ca05d 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorStraighten.java
@@ -40,7 +40,7 @@ public class EditorStraighten extends Editor implements EditorInfo {
public String calculateUserMessage(Context context, String effectName, Object parameterValue) {
String apply = context.getString(R.string.apply_effect);
apply += " " + effectName;
- return apply;
+ return apply.toUpperCase();
}
@Override
diff --git a/src/com/android/gallery3d/filtershow/editors/ParametricEditor.java b/src/com/android/gallery3d/filtershow/editors/ParametricEditor.java
index 02a1c7145..c23b90b33 100644
--- a/src/com/android/gallery3d/filtershow/editors/ParametricEditor.java
+++ b/src/com/android/gallery3d/filtershow/editors/ParametricEditor.java
@@ -93,12 +93,12 @@ public class ParametricEditor extends Editor {
if (mShowParameter == SHOW_VALUE_INT & useCompact(context)) {
if (getLocalRepresentation() instanceof FilterBasicRepresentation) {
FilterBasicRepresentation interval = (FilterBasicRepresentation) getLocalRepresentation();
- apply += " " + effectName + " " + interval.getStateRepresentation();
+ apply += " " + effectName.toUpperCase() + " " + interval.getStateRepresentation();
} else {
- apply += " " + effectName + " " + parameterValue;
+ apply += " " + effectName.toUpperCase() + " " + parameterValue;
}
} else {
- apply += " " + effectName;
+ apply += " " + effectName.toUpperCase();
}
return apply;
}