summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2012-11-28 22:00:50 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-28 22:00:50 -0800
commit1eb3c0af3d9542e68eb18d312dad87485f058378 (patch)
treef36dc211f1921f2ef0b53a3bf964191350c2fb2c /res/layout
parent6bf21d89f32634e52aa3b18743585c224441b145 (diff)
parent6d867ce03ea96495d531d7e3f35a21b5aab257ef (diff)
downloadandroid_packages_apps_Gallery2-1eb3c0af3d9542e68eb18d312dad87485f058378.tar.gz
android_packages_apps_Gallery2-1eb3c0af3d9542e68eb18d312dad87485f058378.tar.bz2
android_packages_apps_Gallery2-1eb3c0af3d9542e68eb18d312dad87485f058378.zip
am 6d867ce0: Set crop ratio to unconstrained by default.
* commit '6d867ce03ea96495d531d7e3f35a21b5aab257ef': Set crop ratio to unconstrained by default.
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/filtershow_activity.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 529a29b7d..26bd1833a 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -186,7 +186,7 @@
android:background="@drawable/filtershow_button_background"
android:scaleType="centerInside"
android:visibility="gone"
- android:text="@string/aspectOriginal_effect" />
+ android:text="@string/aspectNone_effect" />
<com.android.gallery3d.filtershow.ui.FramedTextButton
android:id="@+id/pickCurvesChannel"