Commit 7077701c authored by Bobby Georgescu's avatar Bobby Georgescu
Browse files

Fix incorrect texture size causing artifacts in animation

Bug: 7181383
Change-Id: I3895b89ccdd03e55acc656f0d6944f4a9d398ad5
parent 2e346284
...@@ -242,7 +242,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster ...@@ -242,7 +242,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
} else { } else {
// Render transition in pressed state // Render transition in pressed state
mAlbumView.setPressedIndex(slotIndex); mAlbumView.setPressedIndex(slotIndex);
PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mSlotView, mRootPane); PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mRootPane);
mAlbumView.setPressedIndex(-1); mAlbumView.setPressedIndex(-1);
pickPhoto(slotIndex); pickPhoto(slotIndex);
...@@ -530,7 +530,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster ...@@ -530,7 +530,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
private void prepareAnimationBackToFilmstrip(int slotIndex) { private void prepareAnimationBackToFilmstrip(int slotIndex) {
if (mAlbumDataAdapter == null || !mAlbumDataAdapter.isActive(slotIndex)) return; if (mAlbumDataAdapter == null || !mAlbumDataAdapter.isActive(slotIndex)) return;
PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mSlotView, mRootPane); PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mRootPane);
TransitionStore transitions = mActivity.getTransitionStore(); TransitionStore transitions = mActivity.getTransitionStore();
transitions.put(PhotoPage.KEY_INDEX_HINT, slotIndex); transitions.put(PhotoPage.KEY_INDEX_HINT, slotIndex);
transitions.put(PhotoPage.KEY_MEDIA_ITEM_PATH, transitions.put(PhotoPage.KEY_MEDIA_ITEM_PATH,
......
...@@ -269,7 +269,7 @@ public class AlbumSetPage extends ActivityState implements ...@@ -269,7 +269,7 @@ public class AlbumSetPage extends ActivityState implements
& MediaObject.SUPPORT_IMPORT) != 0) { & MediaObject.SUPPORT_IMPORT) != 0) {
data.putBoolean(AlbumPage.KEY_AUTO_SELECT_ALL, true); data.putBoolean(AlbumPage.KEY_AUTO_SELECT_ALL, true);
} else if (!mGetContent && albumShouldOpenInFilmstrip(targetSet)) { } else if (!mGetContent && albumShouldOpenInFilmstrip(targetSet)) {
PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mSlotView, mRootPane); PreparePageFadeoutTexture.prepareFadeOutTexture(mActivity, mRootPane);
data.putParcelable(PhotoPage.KEY_OPEN_ANIMATION_RECT, data.putParcelable(PhotoPage.KEY_OPEN_ANIMATION_RECT,
mSlotView.getSlotRect(slotIndex, mRootPane)); mSlotView.getSlotRect(slotIndex, mRootPane));
data.putInt(PhotoPage.KEY_INDEX_HINT, 0); data.putInt(PhotoPage.KEY_INDEX_HINT, 0);
......
...@@ -14,8 +14,8 @@ public class PreparePageFadeoutTexture implements OnGLIdleListener { ...@@ -14,8 +14,8 @@ public class PreparePageFadeoutTexture implements OnGLIdleListener {
private boolean mCancelled = false; private boolean mCancelled = false;
private GLView mRootPane; private GLView mRootPane;
public PreparePageFadeoutTexture(int w, int h, GLView rootPane) { public PreparePageFadeoutTexture(GLView rootPane) {
mTexture = new RawTexture(w, h, true); mTexture = new RawTexture(rootPane.getWidth(), rootPane.getHeight(), true);
mRootPane = rootPane; mRootPane = rootPane;
} }
...@@ -44,11 +44,9 @@ public class PreparePageFadeoutTexture implements OnGLIdleListener { ...@@ -44,11 +44,9 @@ public class PreparePageFadeoutTexture implements OnGLIdleListener {
} }
public static void prepareFadeOutTexture(AbstractGalleryActivity activity, public static void prepareFadeOutTexture(AbstractGalleryActivity activity,
SlotView slotView, GLView rootPane) { GLView rootPane) {
GLRoot root = activity.getGLRoot(); GLRoot root = activity.getGLRoot();
PreparePageFadeoutTexture task = new PreparePageFadeoutTexture( PreparePageFadeoutTexture task = new PreparePageFadeoutTexture(rootPane);
slotView.getWidth(), slotView.getHeight() +
activity.getGalleryActionBar().getHeight(), rootPane);
RawTexture texture = null; RawTexture texture = null;
root.unlockRenderThread(); root.unlockRenderThread();
try { try {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment