Fixed initial aspect button text.

Bug: 7374910
Change-Id: I2c86b7c5b242f930692e2e6feda8a85533c509d8

1 files changed, 8 insertions, 1 deletions

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;
             }