From 5e737ffa3eb106518e03d1a9b4d00a58c73640ee Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 16 May 2013 13:50:50 -0700
Subject: toUpper() some strings

 Bug: 8791729

Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb
---
 src/com/android/gallery3d/filtershow/editors/Editor.java     | 8 ++++++++
 src/com/android/gallery3d/filtershow/editors/SwapButton.java | 8 --------
 src/com/android/gallery3d/filtershow/ui/ImageCurves.java     | 2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/com')

diff --git a/src/com/android/gallery3d/filtershow/editors/Editor.java b/src/com/android/gallery3d/filtershow/editors/Editor.java
index e760ae58c..02bbcde4d 100644
--- a/src/com/android/gallery3d/filtershow/editors/Editor.java
+++ b/src/com/android/gallery3d/filtershow/editors/Editor.java
@@ -59,6 +59,14 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
     public static byte SHOW_VALUE_OFF = 0;
     public static byte SHOW_VALUE_INT = 1;
 
+    public static void hackFixStrings(Menu menu) {
+        int count = menu.size();
+        for (int i = 0; i < count; i++) {
+            MenuItem item = menu.getItem(i);
+            item.setTitle(item.getTitle().toString().toUpperCase());
+        }
+    }
+
     public String calculateUserMessage(Context context, String effectName, Object parameterValue) {
         return effectName.toUpperCase() + " " + parameterValue;
     }
diff --git a/src/com/android/gallery3d/filtershow/editors/SwapButton.java b/src/com/android/gallery3d/filtershow/editors/SwapButton.java
index d8f3fc3a7..bb4432e28 100644
--- a/src/com/android/gallery3d/filtershow/editors/SwapButton.java
+++ b/src/com/android/gallery3d/filtershow/editors/SwapButton.java
@@ -51,14 +51,6 @@ public class SwapButton extends Button implements GestureDetector.OnGestureListe
         mListener = listener;
     }
 
-    public Menu getMenu() {
-        return mMenu;
-    }
-
-    public void setMenu(Menu menu) {
-        mMenu = menu;
-    }
-
     public boolean onTouchEvent(MotionEvent me) {
         if (!mDetector.onTouchEvent(me)) {
             return super.onTouchEvent(me);
diff --git a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
index 4755b909e..f7dcad7ce 100644
--- a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
+++ b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
@@ -36,6 +36,7 @@ import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 
 import com.android.gallery3d.R;
+import com.android.gallery3d.filtershow.editors.Editor;
 import com.android.gallery3d.filtershow.editors.EditorCurves;
 import com.android.gallery3d.filtershow.filters.FilterCurvesRepresentation;
 import com.android.gallery3d.filtershow.filters.FiltersManager;
@@ -116,6 +117,7 @@ public class ImageCurves extends ImageShow {
                 return true;
             }
         });
+        Editor.hackFixStrings(popupMenu.getMenu());
         popupMenu.show();
     }
 
-- 
cgit v1.2.3