Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad (fb1884f6) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+21 −1

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ import android.view.WindowManager;
		import android.widget.AdapterView;
		import android.widget.AdapterView.OnItemClickListener;
		import android.widget.FrameLayout;
		import android.widget.PopupMenu;
		import android.widget.ShareActionProvider;
		import android.widget.ShareActionProvider.OnShareTargetSelectedListener;
		import android.widget.Spinner;
		@@ -129,7 +130,7 @@ import java.util.Vector;

		public class FilterShowActivity extends FragmentActivity implements OnItemClickListener,
		OnShareTargetSelectedListener, DialogInterface.OnShowListener,
		DialogInterface.OnDismissListener{
		DialogInterface.OnDismissListener, PopupMenu.OnDismissListener{

		private String mAction = "";
		MasterImage mMasterImage = null;
		@@ -192,6 +193,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
		private boolean mIsBound = false;
		private Menu mMenu;
		private DialogInterface mCurrentDialog = null;
		private PopupMenu mCurrentMenu = null;
		private boolean mLoadingVisible = true;

		public ProcessingService getProcessingService() {
		@@ -712,6 +714,20 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
		return findViewById(id);
		}

		public void onShowMenu(PopupMenu menu) {
		mCurrentMenu = menu;
		menu.setOnDismissListener(this);
		}

		@Override
		public void onDismiss(PopupMenu popupMenu){
		if (mCurrentMenu == null) {
		return;
		}
		mCurrentMenu.setOnDismissListener(null);
		mCurrentMenu = null;
		}

		@Override
		public void onShow(DialogInterface dialog) {
		mCurrentDialog = dialog;
		@@ -1241,6 +1257,10 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
		fillCategories();
		loadMainPanel();

		if (mCurrentMenu != null) {
		mCurrentMenu.dismiss();
		mCurrentMenu = null;
		}
		if (mCurrentDialog != null) {
		mCurrentDialog.dismiss();
		mCurrentDialog = null;

src/com/android/gallery3d/filtershow/editors/EditorChanSat.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.widget.SeekBar.OnSeekBarChangeListener;

		import android.widget.TextView;
		import com.android.gallery3d.R;
		import com.android.gallery3d.filtershow.FilterShowActivity;
		import com.android.gallery3d.filtershow.controller.BasicParameterStyle;
		import com.android.gallery3d.filtershow.controller.BitmapCaller;
		import com.android.gallery3d.filtershow.controller.FilterView;
		@@ -115,6 +116,7 @@ public class EditorChanSat extends ParametricEditor implements OnSeekBarChangeLi
		@Override
		public void onClick(View arg0) {
		popupMenu.show();
		((FilterShowActivity)mContext).onShowMenu(popupMenu);
		}
		});
		mButton.setListener(this);

src/com/android/gallery3d/filtershow/editors/EditorColorBorder.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.widget.PopupMenu;
		import android.widget.SeekBar;

		import com.android.gallery3d.R;
		import com.android.gallery3d.filtershow.FilterShowActivity;
		import com.android.gallery3d.filtershow.controller.BitmapCaller;
		import com.android.gallery3d.filtershow.controller.ColorChooser;
		import com.android.gallery3d.filtershow.controller.FilterView;
		@@ -138,6 +139,7 @@ public class EditorColorBorder extends ParametricEditor {
		}
		});
		popupMenu.show();
		((FilterShowActivity)mContext).onShowMenu(popupMenu);
		}

		protected void selectMenuItem(MenuItem item) {

src/com/android/gallery3d/filtershow/editors/EditorCrop.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.widget.LinearLayout;
		import android.widget.PopupMenu;

		import com.android.gallery3d.R;
		import com.android.gallery3d.filtershow.FilterShowActivity;
		import com.android.gallery3d.filtershow.filters.FilterCropRepresentation;
		import com.android.gallery3d.filtershow.filters.FilterRepresentation;
		import com.android.gallery3d.filtershow.imageshow.ImageCrop;
		@@ -140,6 +141,7 @@ public class EditorCrop extends Editor implements EditorInfo {
		}
		});
		popupMenu.show();
		((FilterShowActivity)mContext).onShowMenu(popupMenu);
		}

		@Override

src/com/android/gallery3d/filtershow/editors/EditorDraw.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import android.widget.PopupMenu;
		import android.widget.SeekBar;

		import com.android.gallery3d.R;
		import com.android.gallery3d.filtershow.FilterShowActivity;
		import com.android.gallery3d.filtershow.colorpicker.ColorHueView;
		import com.android.gallery3d.filtershow.colorpicker.ColorListener;
		import com.android.gallery3d.filtershow.colorpicker.ColorOpacityView;
		@@ -192,7 +193,7 @@ public class EditorDraw extends ParametricEditor implements FilterView {
		});
		}
		popupMenu.show();

		((FilterShowActivity)mContext).onShowMenu(popupMenu);
		}

		protected void selectMenuItem(MenuItem item) {