summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2012-10-15 12:02:54 -0700
committerRuben Brunk <rubenbrunk@google.com>2012-10-16 18:25:00 -0700
commit0f7dc6ef6e736c0993240450b50b91721c79c43e (patch)
treef7898f9854b7a3f59c5e86ae026780198d05a9e4 /res
parente34a5a5eaedb870798a5cc7415079d04a6ca42e0 (diff)
downloadandroid_packages_apps_Gallery2-0f7dc6ef6e736c0993240450b50b91721c79c43e.tar.gz
android_packages_apps_Gallery2-0f7dc6ef6e736c0993240450b50b91721c79c43e.tar.bz2
android_packages_apps_Gallery2-0f7dc6ef6e736c0993240450b50b91721c79c43e.zip
Added fixed aspect ratio support for cropping.
Bug: 7350377 Change-Id: I8110ea999c764de675fe11f586ab9bc7af205f46
Diffstat (limited to 'res')
-rw-r--r--res/layout/filtershow_activity.xml9
-rw-r--r--res/values/filtershow_strings.xml14
2 files changed, 23 insertions, 0 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 885521104..8a51d89ff 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -192,6 +192,15 @@
android:orientation="horizontal"
android:visibility="gone" >
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/aspect"
+ style="@style/FilterShowBottomButton"
+ android:layout_gravity="left"
+ android:layout_weight="0"
+ android:visibility="gone"
+ android:src="@drawable/filtershow_button_geometry_straighten"
+ android:text="@string/aspectNone_effect" />
+
<ImageButton
android:id="@+id/pickCurvesChannel"
android:layout_width="64dip"
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 51ff00ec2..b4ff85f57 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -63,6 +63,20 @@
<string name="apply_effect">Apply</string>
<!-- Label for the reset effect button [CHAR LIMIT=15] -->
<string name="reset_effect">Reset</string>
+ <!-- Label for the aspect 1:1 effect button [CHAR LIMIT=15] -->
+ <string name="aspect">Aspect</string>
+ <!-- Label for the aspect 1:1 effect button [CHAR LIMIT=15] -->
+ <string name="aspect1to1_effect">1:1</string>
+ <!-- Label for the aspect 4:7 effect button [CHAR LIMIT=15] -->
+ <string name="aspect4to6_effect">4:6</string>
+ <!-- Label for the aspect 1:1 effect button [CHAR LIMIT=15] -->
+ <string name="aspect5to7_effect">5:7</string>
+ <!-- Label for the aspect 1:1 effect button [CHAR LIMIT=15] -->
+ <string name="aspect9to16_effect">16:9</string>
+ <!-- Label for the aspect None effect button [CHAR LIMIT=15] -->
+ <string name="aspectNone_effect">None</string>
+ <!-- Label for the aspect None effect button [CHAR LIMIT=15] -->
+ <string name="aspectOriginal_effect">Original</string>
<!-- Filters buttons -->