summaryrefslogtreecommitdiffstats
path: root/photoviewer
diff options
context:
space:
mode:
authorAdam Copp <adamcopp@google.com>2012-09-20 03:34:12 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-20 03:34:12 -0700
commita8141795acc5fce10d992d398b7782be38a4426b (patch)
tree26355185b44cb19575ada45e08dc277a2811f167 /photoviewer
parent11a93227f5e0a627349a73a9c3472700e40618f1 (diff)
parent0b0df704f2214cb589643d9d075396eadd0f77e5 (diff)
downloadandroid_frameworks_ex-a8141795acc5fce10d992d398b7782be38a4426b.tar.gz
android_frameworks_ex-a8141795acc5fce10d992d398b7782be38a4426b.tar.bz2
android_frameworks_ex-a8141795acc5fce10d992d398b7782be38a4426b.zip
Merge "Cursor listeners can use setPhotoIndex meaningfully"
Diffstat (limited to 'photoviewer')
-rw-r--r--photoviewer/src/com/android/ex/photo/PhotoViewActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/photoviewer/src/com/android/ex/photo/PhotoViewActivity.java b/photoviewer/src/com/android/ex/photo/PhotoViewActivity.java
index e0d8292..5e45f5e 100644
--- a/photoviewer/src/com/android/ex/photo/PhotoViewActivity.java
+++ b/photoviewer/src/com/android/ex/photo/PhotoViewActivity.java
@@ -323,6 +323,9 @@ public class PhotoViewActivity extends Activity implements
}
mIsEmpty = false;
+ mAdapter.swapCursor(data);
+ notifyCursorListeners(data);
+
// set the selected photo
int itemIndex = mPhotoIndex;
@@ -331,9 +334,6 @@ public class PhotoViewActivity extends Activity implements
itemIndex = 0;
}
- mAdapter.swapCursor(data);
- notifyCursorListeners(data);
-
mViewPager.setCurrentItem(itemIndex, false);
setViewActivated();
}