From 2161971cef7b2f20e47815c34f79a0ea7c4b6bf4 Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Wed, 24 Oct 2012 11:05:45 -0700
Subject: Took out aspect ratio switching.

Bug: 7406414
Change-Id: Iba6e59d728d6f1ce81ea62b01a86dfaa355383b9
---
 res/menu/filtershow_menu_crop.xml | 13 ++++++++++++-
 res/values/filtershow_strings.xml |  8 +++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/menu/filtershow_menu_crop.xml b/res/menu/filtershow_menu_crop.xml
index dc85d6fde..f8ba3df42 100644
--- a/res/menu/filtershow_menu_crop.xml
+++ b/res/menu/filtershow_menu_crop.xml
@@ -6,12 +6,23 @@
             android:title="@string/aspect1to1_effect"/>
         <item
             android:id="@+id/crop_menu_4to6"
+            android:visible="false"
             android:title="@string/aspect4to6_effect"/>
+        <item
+            android:id="@+id/crop_menu_4to3"
+            android:title="@string/aspect4to3_effect"/>
+        <item
+            android:id="@+id/crop_menu_3to4"
+            android:title="@string/aspect3to4_effect"/>
         <item
             android:id="@+id/crop_menu_5to7"
             android:title="@string/aspect5to7_effect"/>
+        <item
+            android:id="@+id/crop_menu_7to5"
+            android:title="@string/aspect7to5_effect"/>
         <item
             android:id="@+id/crop_menu_9to16"
+            android:visible="false"
             android:title="@string/aspect9to16_effect"/>
         <item
             android:id="@+id/crop_menu_none"
@@ -21,4 +32,4 @@
             android:title="@string/aspectOriginal_effect"/>
     </group>
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 852ef7474..b04413c7d 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -78,10 +78,16 @@
     <string name="aspect">Aspect</string>
     <!--  Label for the aspect 1:1 effect [CHAR LIMIT=15] -->
     <string name="aspect1to1_effect">1:1</string>
+    <!--  Label for the aspect 4:3 effect [CHAR LIMIT=15] -->
+    <string name="aspect4to3_effect">4:3</string>
+    <!--  Label for the aspect 3:4 effect [CHAR LIMIT=15] -->
+    <string name="aspect3to4_effect">3:4</string>
     <!--  Label for the aspect 4:7 effect [CHAR LIMIT=15] -->
     <string name="aspect4to6_effect">4:6</string>
-    <!--  Label for the aspect 1:1 effect [CHAR LIMIT=15] -->
+    <!--  Label for the aspect 5:7 effect [CHAR LIMIT=15] -->
     <string name="aspect5to7_effect">5:7</string>
+    <!--  Label for the aspect 7:5 effect [CHAR LIMIT=15] -->
+    <string name="aspect7to5_effect">7:5</string>
     <!--  Label for the aspect 1:1 effect [CHAR LIMIT=15] -->
     <string name="aspect9to16_effect">16:9</string>
     <!--  Label for the aspect None effect [CHAR LIMIT=15] -->
-- 
cgit v1.2.3