diff options
| -rw-r--r-- | src/com/android/gallery3d/app/AbstractGalleryActivity.java | 5 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/AbstractGalleryActivity.java b/src/com/android/gallery3d/app/AbstractGalleryActivity.java index 76649cab4..88ac028e1 100644 --- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java +++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java @@ -303,4 +303,9 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext public PanoramaViewHelper getPanoramaViewHelper() { return mPanoramaViewHelper; } + + protected boolean isFullscreen() { + return (getWindow().getAttributes().flags + & WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0; + } } diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 00190572a..04e6fd413 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -687,6 +687,8 @@ public class PhotoPage extends ActivityState implements intent.setClass(mActivity, FilterShowActivity.class); intent.setDataAndType(current.getContentUri(), current.getMimeType()) .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + intent.putExtra(FilterShowActivity.LAUNCH_FULLSCREEN, + mActivity.isFullscreen()); mRecenterCameraOnResume = false; mActivity.startActivityForResult(intent, REQUEST_EDIT); overrideTransitionToEditor(); @@ -707,6 +709,8 @@ public class PhotoPage extends ActivityState implements .queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY).size() == 0) { intent.setAction(Intent.ACTION_EDIT); } + intent.putExtra(FilterShowActivity.LAUNCH_FULLSCREEN, + mActivity.isFullscreen()); mRecenterCameraOnResume = false; ((Activity) mActivity).startActivityForResult(Intent.createChooser(intent, null), REQUEST_EDIT); diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 5a898c2c3..8bae88cad 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -38,6 +38,7 @@ import android.view.Display; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.view.WindowManager; import android.view.View.OnClickListener; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; @@ -94,6 +95,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, public static final String CROP_ACTION = "com.android.camera.action.CROP"; public static final String TINY_PLANET_ACTION = "com.android.camera.action.TINY_PLANET"; + public static final String LAUNCH_FULLSCREEN = "launch-fullscreen"; private final PanelController mPanelController = new PanelController(); private ImageLoader mImageLoader = null; private ImageShow mImageShow = null; @@ -352,6 +354,10 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, mPanelController.setMasterImage(mImageShow); mPanelController.setCurrentPanel(mFxButton); Intent intent = getIntent(); + if (intent.getBooleanExtra(LAUNCH_FULLSCREEN, false)) { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); + } + String data = intent.getDataString(); if (data != null) { Uri uri = Uri.parse(data); |