diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/MoviePlayer.java | 1 | ||||
| -rwxr-xr-x | src/com/android/gallery3d/app/PhotoPage.java | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/com/android/gallery3d/ui/TimeLineSlotView.java | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java index ead31e211..162c0731c 100644 --- a/src/com/android/gallery3d/app/MoviePlayer.java +++ b/src/com/android/gallery3d/app/MoviePlayer.java @@ -1371,6 +1371,7 @@ public class MoviePlayer implements Log.v(TAG, "PositiveButton.onClick() mIsShowDialog=" + mIsShowDialog); } + mVideoView.setDialogShowState(false); doStartVideo(true, mVideoPosition, mVideoLastDuration); } diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index fdcb573bb..3000d056b 100755 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -1415,7 +1415,9 @@ public abstract class PhotoPage extends ActivityState implements mActivity.getStateManager().startState(SinglePhotoPage.class, data); return; } - mModel.setCurrentPhoto(path, mCurrentIndex); + if (null != mModel) { + mModel.setCurrentPhoto(path, mCurrentIndex); + } } } diff --git a/src/com/android/gallery3d/ui/TimeLineSlotView.java b/src/com/android/gallery3d/ui/TimeLineSlotView.java index 329ea75e3..7dcf4ef5f 100644..100755 --- a/src/com/android/gallery3d/ui/TimeLineSlotView.java +++ b/src/com/android/gallery3d/ui/TimeLineSlotView.java @@ -589,7 +589,9 @@ public class TimeLineSlotView extends GLView { if (mSlotCount != null) { Slot begin = getSlotByPosition(0, mScrollPosition, true, false), end = getSlotByPosition(0, mScrollPosition + mHeight, true, true); - if (begin != null && end != null) { + if (begin == null && end != null && end.index == 0) { + setVisibleRange(0, 0); + } else if (begin != null && end != null) { setVisibleRange(begin.index, end.index); } } |