am 4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce

* commit '4a6dc2b147af34ab4545f6f647b4038c64fc80d0':
  Reenables crop aspect ratio menu.

1 files changed, 1 insertions, 8 deletions

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
index 6d62bbd1d..3208732b7 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
@@ -671,53 +671,46 @@ public class ImageCrop extends ImageGeometry {
         }
     }
 
-    private void setAspectButton(FramedTextButton button, int itemId) {
+    public void setAspectButton(int itemId) {
         switch (itemId) {
             case R.id.crop_menu_1to1: {
                 String t = getActivity().getString(R.string.aspect1to1_effect);
-                button.setText(t);
                 apply(1, 1);
                 setAspectString(t);
                 break;
             }
             case R.id.crop_menu_4to3: {
                 String t = getActivity().getString(R.string.aspect4to3_effect);
-                button.setText(t);
                 apply(4, 3);
                 setAspectString(t);
                 break;
             }
             case R.id.crop_menu_3to4: {
                 String t = getActivity().getString(R.string.aspect3to4_effect);
-                button.setText(t);
                 apply(3, 4);
                 setAspectString(t);
                 break;
             }
             case R.id.crop_menu_5to7: {
                 String t = getActivity().getString(R.string.aspect5to7_effect);
-                button.setText(t);
                 apply(5, 7);
                 setAspectString(t);
                 break;
             }
             case R.id.crop_menu_7to5: {
                 String t = getActivity().getString(R.string.aspect7to5_effect);
-                button.setText(t);
                 apply(7, 5);
                 setAspectString(t);
                 break;
             }
             case R.id.crop_menu_none: {
                 String t = getActivity().getString(R.string.aspectNone_effect);
-                button.setText(t);
                 applyClear();
                 setAspectString(t);
                 break;
             }
             case R.id.crop_menu_original: {
                 String t = getActivity().getString(R.string.aspectOriginal_effect);
-                button.setText(t);
                 applyOriginal();
                 setAspectString(t);
                 break;