summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-05-16 20:56:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-16 20:56:30 +0000
commitb9974cb7e9f117c639399c3b13823e13be47f18e (patch)
treeeb91d9be83af9c3f3b5a91bf2f2621203d079ba6 /src/com/android/gallery3d
parent436a2bcaf47c32a2a1b1cee2871d936c062ce699 (diff)
parent5e737ffa3eb106518e03d1a9b4d00a58c73640ee (diff)
downloadandroid_packages_apps_Snap-b9974cb7e9f117c639399c3b13823e13be47f18e.tar.gz
android_packages_apps_Snap-b9974cb7e9f117c639399c3b13823e13be47f18e.tar.bz2
android_packages_apps_Snap-b9974cb7e9f117c639399c3b13823e13be47f18e.zip
Merge "toUpper() some strings" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r--src/com/android/gallery3d/filtershow/editors/Editor.java8
-rw-r--r--src/com/android/gallery3d/filtershow/editors/SwapButton.java8
-rw-r--r--src/com/android/gallery3d/filtershow/ui/ImageCurves.java2
3 files changed, 10 insertions, 8 deletions
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();
}