summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/PhotoDataAdapter.java
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-10-19 15:43:38 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-19 16:19:09 -0700
commit7eeb00e767afa7761c28fc96007505043c69c7f5 (patch)
tree41834ceac6ac2f42634941b2a97e68df068d75ae /src/com/android/gallery3d/app/PhotoDataAdapter.java
parent1d3823a2fde62fbc5e2763ace81ac003271f970f (diff)
downloadandroid_packages_apps_Snap-7eeb00e767afa7761c28fc96007505043c69c7f5.tar.gz
android_packages_apps_Snap-7eeb00e767afa7761c28fc96007505043c69c7f5.tar.bz2
android_packages_apps_Snap-7eeb00e767afa7761c28fc96007505043c69c7f5.zip
Fix delete and undo behavior on filmstrip
Bug: 7353749 Change-Id: Ib0abd3f71783c01b1df418dd76e674bf05e65ce7
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoDataAdapter.java')
-rw-r--r--src/com/android/gallery3d/app/PhotoDataAdapter.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/PhotoDataAdapter.java b/src/com/android/gallery3d/app/PhotoDataAdapter.java
index 20f15be10..731b3fc79 100644
--- a/src/com/android/gallery3d/app/PhotoDataAdapter.java
+++ b/src/com/android/gallery3d/app/PhotoDataAdapter.java
@@ -1070,8 +1070,12 @@ 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
- && index > 0) {
+ int focusHintDirection = mFocusHintDirection;
+ if (index == (mCameraIndex + 1)) {
+ focusHintDirection = FOCUS_HINT_NEXT;
+ }
+ if (focusHintDirection == FOCUS_HINT_PREVIOUS
+ && index > 0) {
index--;
}
}