summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/AlbumPage.java
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2012-04-26 10:10:49 +0800
committerChih-Chung Chang <chihchung@google.com>2012-04-30 16:16:26 +0800
commitad08811a71e246d45ecdf97402f08cf7bd68e83b (patch)
tree5f4eb9ad54e4c3d1aef67c4047624977d1f287e2 /src/com/android/gallery3d/app/AlbumPage.java
parentac9c2f6f230660a657f9d3b64c7a3bbf8b3bd598 (diff)
downloadandroid_packages_apps_Snap-ad08811a71e246d45ecdf97402f08cf7bd68e83b.tar.gz
android_packages_apps_Snap-ad08811a71e246d45ecdf97402f08cf7bd68e83b.tar.bz2
android_packages_apps_Snap-ad08811a71e246d45ecdf97402f08cf7bd68e83b.zip
Support drawing in different orientation in Gallery.
Bug 6312994: Swipe UX: do not directly show the camera roll when camera starts Bug 6313191: Swipe UX: Change swipe direction after the user rotated the device Bug 6313192: Swiping UX: make Gallery display in rotated mode Bug 6399447: Filmstrip: in Gallery, pressing Back from filmstrip doesn't perform the right animation Bug 6399974: Filmstrip: when swiping from full-screen photo to filmstrip mode, camera view and the photo-roll don't align correctly Bug 6400014: Swiping UX: in Camera portrait mode, tapping on the Thumbnail doesn't align camera view and the photo-roll correctly Bug 6401075: Able to scroll through the gallery pics while capturing video. Bug 6405087: Filmstrip does not change with orientation Change-Id: I8c479d87800c63b7a95c199c0c1c3bc512d66d42
Diffstat (limited to 'src/com/android/gallery3d/app/AlbumPage.java')
-rw-r--r--src/com/android/gallery3d/app/AlbumPage.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index c3b04d617..9dd05ac89 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -51,7 +51,6 @@ import com.android.gallery3d.ui.GLCanvas;
import com.android.gallery3d.ui.GLRoot;
import com.android.gallery3d.ui.GLView;
import com.android.gallery3d.ui.RelativePosition;
-import com.android.gallery3d.ui.ScreenNailHolder;
import com.android.gallery3d.ui.SelectionManager;
import com.android.gallery3d.ui.SlotView;
import com.android.gallery3d.ui.SynchronizedHandler;
@@ -79,7 +78,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
private static final int BIT_LOADING_SYNC = 2;
private static final float USER_DISTANCE_METER = 0.3f;
- private static final boolean TEST_CAMERA_PREVIEW = false;
private boolean mIsActive = false;
private AlbumSlotRenderer mAlbumView;
@@ -210,10 +208,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
mMediaSetPath.toString());
data.putString(PhotoPage.KEY_MEDIA_ITEM_PATH,
item.getPath().toString());
- if (TEST_CAMERA_PREVIEW) {
- ScreenNailHolder holder = new CameraScreenNailHolder(mActivity);
- data.putParcelable(PhotoPage.KEY_SCREENNAIL_HOLDER, holder);
- }
mActivity.getStateManager().startStateForResult(
PhotoPage.class, REQUEST_PHOTO, data);
}
@@ -527,7 +521,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
}
case REQUEST_PHOTO: {
if (data == null) return;
- mFocusIndex = data.getIntExtra(PhotoPage.KEY_INDEX_HINT, 0);
+ mFocusIndex = data.getIntExtra(PhotoPage.KEY_RETURN_INDEX_HINT, 0);
mSlotView.setCenterIndex(mFocusIndex);
mSlotView.startRestoringAnimation(mFocusIndex);
break;