summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-05-16 13:57:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-16 13:57:58 -0700
commitaa4f40fe94266ed53f900d6199f30084b578b0b8 (patch)
treeffb200459b41215b90120dd4443a94fe80c060ee
parentf677ba87180a01fe507a6206bc85c45522f8089e (diff)
parent0dd0a2b9f138c44f50977d0ebcbf308f1af83651 (diff)
downloadandroid_packages_apps_Snap-aa4f40fe94266ed53f900d6199f30084b578b0b8.tar.gz
android_packages_apps_Snap-aa4f40fe94266ed53f900d6199f30084b578b0b8.tar.bz2
android_packages_apps_Snap-aa4f40fe94266ed53f900d6199f30084b578b0b8.zip
am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce
* commit '75084da1b34e0ff9f269b5409d206c213532edbc': toUpper() some strings
-rw-r--r--res/layout-land/filtershow_editor_panel.xml3
-rw-r--r--res/layout/filtershow_editor_panel.xml3
2 files changed, 4 insertions, 2 deletions
diff --git a/res/layout-land/filtershow_editor_panel.xml b/res/layout-land/filtershow_editor_panel.xml
index 85ab010db..015fa26a7 100644
--- a/res/layout-land/filtershow_editor_panel.xml
+++ b/res/layout-land/filtershow_editor_panel.xml
@@ -101,7 +101,8 @@
android:gravity="center"
android:text="@string/apply_effect"
android:textSize="18dip"
- android:drawableRight="@drawable/filtershow_menu_marker"/>
+ android:drawableRight="@drawable/filtershow_menu_marker"
+ android:textAllCaps="true" />
</LinearLayout>
diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml
index ef2fb8bfc..a6da46a08 100644
--- a/res/layout/filtershow_editor_panel.xml
+++ b/res/layout/filtershow_editor_panel.xml
@@ -85,7 +85,8 @@
android:gravity="center"
android:text="@string/apply_effect"
android:textSize="18dip"
- android:drawableRight="@drawable/filtershow_menu_marker"/>
+ android:drawableRight="@drawable/filtershow_menu_marker"
+ android:textAllCaps="true" />
</LinearLayout>