From eb4a9359eaf8a717d6bda5df3d1831cf8f547423 Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Thu, 18 Oct 2012 12:46:28 -0700
Subject: [PATCH] Fixed initial aspect button text.

Bug: 7374910
Change-Id: I2c86b7c5b242f930692e2e6feda8a85533c509d8
---
 res/layout/filtershow_activity.xml                        |  2 +-
 res/values/filtershow_strings.xml                         | 14 +++++++-------
 src/com/android/gallery3d/filtershow/PanelController.java |  9 ++++++++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index d098dc89d..78fe2d8b6 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -200,7 +200,7 @@
                     android:layout_weight="0"
                     android:visibility="gone"
                     android:src="@drawable/filtershow_button_geometry_straighten"
-                    android:text="@string/aspectNone_effect" />
+                    android:text="@string/aspect" />
 
                 <ImageButton
                     android:id="@+id/pickCurvesChannel"
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 142a3a042..d4d02f597 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -63,19 +63,19 @@
     <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] -->
+    <!--  Label for aspect [CHAR LIMIT=15] -->
     <string name="aspect">Aspect</string>
-    <!--  Label for the aspect 1:1 effect button [CHAR LIMIT=15] -->
+    <!--  Label for the aspect 1:1 effect [CHAR LIMIT=15] -->
     <string name="aspect1to1_effect">1:1</string>
-    <!--  Label for the aspect 4:7 effect button [CHAR LIMIT=15] -->
+    <!--  Label for the aspect 4:7 effect [CHAR LIMIT=15] -->
     <string name="aspect4to6_effect">4:6</string>
-    <!--  Label for the aspect 1:1 effect button [CHAR LIMIT=15] -->
+    <!--  Label for the aspect 1:1 effect [CHAR LIMIT=15] -->
     <string name="aspect5to7_effect">5:7</string>
-    <!--  Label for the aspect 1:1 effect button [CHAR LIMIT=15] -->
+    <!--  Label for the aspect 1:1 effect [CHAR LIMIT=15] -->
     <string name="aspect9to16_effect">16:9</string>
-    <!--  Label for the aspect None effect button [CHAR LIMIT=15] -->
+    <!--  Label for the aspect None effect [CHAR LIMIT=15] -->
     <string name="aspectNone_effect">None</string>
-    <!--  Label for the aspect None effect button [CHAR LIMIT=15] -->
+    <!--  Label for the aspect None effect [CHAR LIMIT=15] -->
     <string name="aspectOriginal_effect">Original</string>
 
     <!--  Filters buttons -->
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 2e8dd23ce..b0f38892b 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -186,14 +186,19 @@ public class PanelController implements OnClickListener {
                         ((ImageButtonTitle) mAspectButton).setText(mContext
                                 .getString(R.string.aspect)
                                 + " "
-                                + mContext.getString(R.string.aspect1to1_effect));
+                                + mContext.getString(R.string.aspectNone_effect));
                         ((ImageCrop) mCurrentImage).applyClear();
+                        mCurrentAspectButton = ASPECT_NONE;
                         break;
                 }
                 mCurrentAspectButton = (mCurrentAspectButton + 1) % NUMBER_OF_ASPECT_BUTTONS;
             }
         }
 
+        void setCurrentAspectButton(int n){
+            mCurrentAspectButton = n;
+        }
+
         public void showAspectButtons() {
             if (mAspectButton != null)
                 mAspectButton.setVisibility(View.VISIBLE);
@@ -507,6 +512,8 @@ public class PanelController implements OnClickListener {
                 String ename = mCurrentImage.getContext().getString(R.string.crop);
                 mUtilityPanel.setEffectName(ename);
                 mUtilityPanel.setShowParameter(false);
+                mUtilityPanel.setCurrentAspectButton(-1);
+                mUtilityPanel.nextAspectButton();
                 mUtilityPanel.showAspectButtons();
                 break;
             }
-- 
2.11.0