diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-09-18 10:21:21 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-18 10:21:21 -0700 |
commit | 0bb34d3547f62df1a1fbc0bb261b9ffaba280b40 (patch) | |
tree | ea678ec4af921e2f2c625e619fbfe991a2b6e921 /src/com/android/gallery3d | |
parent | 4cb71a4cefa7ad7fb3bb740ff67c584e9499b535 (diff) | |
parent | 53c755963bfab7614c1c2fe381d7c2b767606ed5 (diff) | |
download | android_packages_apps_Snap-0bb34d3547f62df1a1fbc0bb261b9ffaba280b40.tar.gz android_packages_apps_Snap-0bb34d3547f62df1a1fbc0bb261b9ffaba280b40.tar.bz2 android_packages_apps_Snap-0bb34d3547f62df1a1fbc0bb261b9ffaba280b40.zip |
Merge "Fix incorrect texture size causing artifacts in animation" into gb-ub-photos-arches
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 4 | ||||
-rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 2 | ||||
-rw-r--r-- | src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java | 10 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index fade00c47..9bb2c3730 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -242,7 +242,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster } else { // Render transition in pressed state mAlbumView.setPressedIndex(slotIndex); - PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mSlotView, mRootPane); + PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mRootPane); mAlbumView.setPressedIndex(-1); pickPhoto(slotIndex); @@ -530,7 +530,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster private void prepareAnimationBackToFilmstrip(int slotIndex) { if (mAlbumDataAdapter == null || !mAlbumDataAdapter.isActive(slotIndex)) return; - PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mSlotView, mRootPane); + PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mRootPane); TransitionStore transitions = mActivity.getTransitionStore(); transitions.put(PhotoPage.KEY_INDEX_HINT, slotIndex); transitions.put(PhotoPage.KEY_MEDIA_ITEM_PATH, diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index 59286a9f8..7558acc82 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -269,7 +269,7 @@ public class AlbumSetPage extends ActivityState implements & MediaObject.SUPPORT_IMPORT) != 0) { data.putBoolean(AlbumPage.KEY_AUTO_SELECT_ALL, true); } else if (!mGetContent && albumShouldOpenInFilmstrip(targetSet)) { - PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mSlotView, mRootPane); + PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mRootPane); data.putParcelable(PhotoPage.KEY_OPEN_ANIMATION_RECT, mSlotView.getSlotRect(slotIndex, mRootPane)); data.putInt(PhotoPage.KEY_INDEX_HINT, 0); diff --git a/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java b/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java index b4310662f..812e831e1 100644 --- a/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java +++ b/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java @@ -14,8 +14,8 @@ public class PreparePageFadeoutTexture implements OnGLIdleListener { private boolean mCancelled = false; private GLView mRootPane; - public PreparePageFadeoutTexture(int w, int h, GLView rootPane) { - mTexture = new RawTexture(w, h, true); + public PreparePageFadeoutTexture(GLView rootPane) { + mTexture = new RawTexture(rootPane.getWidth(), rootPane.getHeight(), true); mRootPane = rootPane; } @@ -44,11 +44,9 @@ public class PreparePageFadeoutTexture implements OnGLIdleListener { } public static void prepareFadeOutTexture(AbstractGalleryActivity activity, - SlotView slotView, GLView rootPane) { + GLView rootPane) { GLRoot root = activity.getGLRoot(); - PreparePageFadeoutTexture task = new PreparePageFadeoutTexture( - slotView.getWidth(), slotView.getHeight() + - activity.getGalleryActionBar().getHeight(), rootPane); + PreparePageFadeoutTexture task = new PreparePageFadeoutTexture(rootPane); RawTexture texture = null; root.unlockRenderThread(); try { |