}
private void onUpPressed() {
- if (mActivity.getStateManager().getStateCount() > 1) {
+ if (mInCameraApp) {
+ GalleryUtils.startGalleryActivity(mActivity);
+ } else if (mActivity.getStateManager().getStateCount() > 1) {
super.onBackPressed();
} else if (mParentMediaSetString != null) {
Bundle data = new Bundle(getData());
}
private void onUpPressed() {
- if (mStartInFilmstrip && !mPhotoView.getFilmMode()) {
+ if ((mStartInFilmstrip || mAppBridge != null)
+ && !mPhotoView.getFilmMode()) {
mPhotoView.setFilmMode(true);
return;
}
DataManager.INCLUDE_ALL));
mActivity.getStateManager().switchState(this, AlbumPage.class, data);
} else {
- // Start the real gallery activity to view the camera roll.
- Uri uri = Uri.parse("content://media/external/file?bucketId="
- + MediaSetUtils.CAMERA_BUCKET_ID);
- Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.setDataAndType(uri, ContentResolver.CURSOR_DIR_BASE_TYPE + "/image");
- ((Activity) mActivity).startActivity(intent);
+ GalleryUtils.startGalleryActivity(mActivity);
}
}
import android.view.WindowManager;
import com.android.gallery3d.R;
+import com.android.gallery3d.app.Gallery;
import com.android.gallery3d.app.PackagesMonitor;
import com.android.gallery3d.common.ApiHelper;
import com.android.gallery3d.data.DataManager;
context.startActivity(intent);
}
+ public static void startGalleryActivity(Context context) {
+ Intent intent = new Intent(context, Gallery.class);
+ context.startActivity(intent);
+ }
+
public static boolean isValidLocation(double latitude, double longitude) {
// TODO: change || to && after we fix the default location issue
return (latitude != MediaItem.INVALID_LATLNG || longitude != MediaItem.INVALID_LATLNG);