private Future<Integer> mSyncTask = null;
private boolean mLaunchedFromPhotoPage;
private boolean mInCameraApp;
+ private boolean mInCameraAndWantQuitOnPause;
private int mLoadingBits = 0;
private boolean mInitialSynced = false;
setLoadingBit(BIT_LOADING_SYNC);
mSyncTask = mMediaSet.requestSync(this);
}
+ mInCameraAndWantQuitOnPause = mInCameraApp;
}
@Override
// The camera app should always launch in capture mode when
// resumed, so make the next resume faster by closing the grid
// view now
- if (mInCameraApp) {
+ if (mInCameraAndWantQuitOnPause) {
if (mActivity.getStateManager().getTopState() == this)
mActivity.getStateManager().finishState(this, false);
}
return true;
}
case R.id.action_slideshow: {
+ mInCameraAndWantQuitOnPause = false;
Bundle data = new Bundle();
data.putString(SlideshowPage.KEY_SET_PATH,
mMediaSetPath.toString());