summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/PhotoPage.java
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2011-08-28 10:50:21 +0800
committerOwen Lin <owenlin@google.com>2011-08-30 10:56:43 +0800
commit44aac4bcb6ddd0b6553a198db4adb479d3437c8e (patch)
tree034376bdd3cb6c5cc14945a6b1e1832af5a80a46 /src/com/android/gallery3d/app/PhotoPage.java
parentb60402ba7551478d324fb777bb5f45b11dffe37c (diff)
downloadandroid_packages_apps_Snap-44aac4bcb6ddd0b6553a198db4adb479d3437c8e.tar.gz
android_packages_apps_Snap-44aac4bcb6ddd0b6553a198db4adb479d3437c8e.tar.bz2
android_packages_apps_Snap-44aac4bcb6ddd0b6553a198db4adb479d3437c8e.zip
Fix several issues in Gallery2.
fix: 5189318 - use transparent background for tabs fix: 5174277 - menu mailfunctioned after slideshow (a hack): fix: 5153387 - wrong tab is selected in album set page Change-Id: I68092039e566b5f7409ae509f65b227b06da16bb
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 4fbffb55a..421f15ca1 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -66,6 +66,7 @@ public class PhotoPage extends ActivityState
private static final String TAG = "PhotoPage";
private static final int MSG_HIDE_BARS = 1;
+
private static final int HIDE_BARS_TIMEOUT = 3500;
private static final int REQUEST_SLIDESHOW = 1;
@@ -388,8 +389,7 @@ public class PhotoPage extends ActivityState
switch (action) {
case R.id.action_slideshow: {
Bundle data = new Bundle();
- data.putString(SlideshowPage.KEY_SET_PATH,
- mMediaSet.getPath().toString());
+ data.putString(SlideshowPage.KEY_SET_PATH, mMediaSet.getPath().toString());
data.putInt(SlideshowPage.KEY_PHOTO_INDEX, currentIndex);
data.putBoolean(SlideshowPage.KEY_REPEAT, true);
mActivity.getStateManager().startStateForResult(
@@ -562,17 +562,24 @@ public class PhotoPage extends ActivityState
private class MyDetailsSource implements DetailsSource {
private int mIndex;
+
+ @Override
public MediaDetails getDetails() {
return mModel.getCurrentMediaItem().getDetails();
}
+
+ @Override
public int size() {
return mMediaSet != null ? mMediaSet.getMediaItemCount() : 1;
}
+
+ @Override
public int findIndex(int indexHint) {
mIndex = indexHint;
return indexHint;
}
+ @Override
public int getIndex() {
return mIndex;
}