Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorCrop.java b/src/com/android/gallery3d/filtershow/editors/EditorCrop.java
index e2173ad..24a83cd 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorCrop.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorCrop.java
@@ -17,8 +17,13 @@
package com.android.gallery3d.filtershow.editors;
import android.content.Context;
+import android.view.MenuItem;
import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.PopupMenu;
import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.crop.CropExtras;
@@ -62,6 +67,38 @@
}
@Override
+ public void openUtilityPanel(final LinearLayout accessoryViewList) {
+ Button view = (Button) accessoryViewList.findViewById(R.id.applyEffect);
+ view.setText(mContext.getString(R.string.crop));
+ view.setOnClickListener(new OnClickListener() {
+
+ @Override
+ public void onClick(View arg0) {
+ showPopupMenu(accessoryViewList);
+ }
+ });
+ }
+
+ private void showPopupMenu(LinearLayout accessoryViewList) {
+ final Button button = (Button) accessoryViewList.findViewById(
+ R.id.applyEffect);
+ if (button == null) {
+ return;
+ }
+ final PopupMenu popupMenu = new PopupMenu(mImageShow.getActivity(), button);
+ popupMenu.getMenuInflater().inflate(R.menu.filtershow_menu_crop, popupMenu.getMenu());
+ popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ mImageCrop.setAspectButton(item.getItemId());
+ return true;
+ }
+ });
+ popupMenu.show();
+ }
+
+ @Override
public boolean showsSeekBar() {
return false;
}
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
index 6d62bbd..3208732 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
@@ -671,53 +671,46 @@
}
}
- 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;