From b3e3014a4eeb3cc447a28b212c1dcc538e79eef9 Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Mon, 15 Oct 2012 12:02:54 -0700
Subject: Added fixed aspect ratio support for cropping.

Bug: 7350377
Change-Id: I8110ea999c764de675fe11f586ab9bc7af205f46
---
 res/layout/filtershow_activity.xml |  9 +++++++++
 res/values/filtershow_strings.xml  | 14 ++++++++++++++
 2 files changed, 23 insertions(+)

(limited to 'res')

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 -->
 
-- 
cgit v1.2.3