Fix delete and undo behavior on filmstrip (41b3cff6) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/app/PhotoDataAdapter.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -1070,7 +1070,11 @@ public class PhotoDataAdapter implements PhotoPage.Model {
		// case the index needs to be limited to [0, mSize).
		if (index == MediaSet.INDEX_NOT_FOUND) {
		index = info.indexHint;
		if (mFocusHintDirection == FOCUS_HINT_PREVIOUS
		int focusHintDirection = mFocusHintDirection;
		if (index == (mCameraIndex + 1)) {
		focusHintDirection = FOCUS_HINT_NEXT;
		}
		if (focusHintDirection == FOCUS_HINT_PREVIOUS
		&& index > 0) {
		index--;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -345,7 +345,7 @@ public class PhotoPage extends ActivityState implements
		mMediaSet.getMediaItemCount() > 1) {
		mPhotoView.switchToImage(1);
		} else {
		mPhotoView.setFilmMode(mPhotoView.canUndo());
		mPhotoView.setFilmMode(false);
		stayedOnCamera = true;
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -1304,7 +1304,8 @@ public class PhotoView extends GLView {
		mFilmMode = enabled;
		mPositionController.setFilmMode(mFilmMode);
		mModel.setNeedFullImage(!enabled);
		mModel.setFocusHintDirection(Model.FOCUS_HINT_NEXT);
		mModel.setFocusHintDirection(
		mFilmMode ? Model.FOCUS_HINT_PREVIOUS : Model.FOCUS_HINT_NEXT);
		updateActionBar();
		mListener.onFilmModeChanged(enabled);
		}
		@@ -1381,7 +1382,7 @@ public class PhotoView extends GLView {
		boolean touched = (mUndoBarState & UNDO_BAR_TOUCHED) != 0;
		boolean fullCamera = (mUndoBarState & UNDO_BAR_FULL_CAMERA) != 0;
		boolean deleteLast = (mUndoBarState & UNDO_BAR_DELETE_LAST) != 0;
		if ((timeout && (touched \|\| deleteLast)) \|\| fullCamera) {
		if ((timeout && deleteLast) \|\| fullCamera \|\| touched) {
		hideUndoBar();
		}
		}