Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c1f01e2 authored by Chih-Chung Chang's avatar Chih-Chung Chang
Browse files

Small UI tweak: only show fade-in animation when the bitmap

has not been available for rendering before.

Change-Id: I57df7911c5afa7aa2eec910d0e21679ed978ddad
parent 15457fad
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ public class AlbumSetSlidingWindow implements AlbumSetView.ModelListener {
        private Texture mContent;
        private final long mDataVersion;
        private boolean mIsPanorama;
        private boolean mWaitLoadingDisplayed;

        public GalleryDisplayItem(int slotIndex, int coverIndex, MediaItem item) {
            super(item);
@@ -360,7 +361,11 @@ public class AlbumSetSlidingWindow implements AlbumSetView.ModelListener {
            if (bitmap != null) {
                BitmapTexture texture = new BitmapTexture(bitmap, true);
                texture.setThrottled(true);
                if (mWaitLoadingDisplayed) {
                    updateContent(new FadeInTexture(PLACEHOLDER_COLOR, texture));
                } else {
                    updateContent(texture);
                }
                if (mListener != null) mListener.onContentInvalidated();
            }
        }
@@ -401,7 +406,11 @@ public class AlbumSetSlidingWindow implements AlbumSetView.ModelListener {
                    (cacheFlag == MediaSet.CACHE_FLAG_FULL)
                    && (cacheStatus != MediaSet.CACHE_STATUS_CACHED_FULL));

            if (mContent != mWaitLoadingTexture &&
            if (mContent == mWaitLoadingTexture) {
                mWaitLoadingDisplayed = true;
            }

            if ((mContent instanceof FadeInTexture) &&
                    ((FadeInTexture) mContent).isAnimating()) {
                return RENDER_MORE_FRAME;
            } else {
+10 −2
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ public class AlbumSlidingWindow implements AlbumView.ModelListener {
        private final int mMediaType;
        private Texture mContent;
        private boolean mIsPanorama;
        private boolean mWaitLoadingDisplayed;

        public AlbumDisplayItem(int slotIndex, MediaItem item) {
            super(item);
@@ -307,7 +308,11 @@ public class AlbumSlidingWindow implements AlbumView.ModelListener {
            if (bitmap != null) {
                BitmapTexture texture = new BitmapTexture(bitmap, true);
                texture.setThrottled(true);
                if (mWaitLoadingDisplayed) {
                    updateContent(new FadeInTexture(PLACEHOLDER_COLOR, texture));
                } else {
                    updateContent(texture);
                }
                if (mListener != null && isActiveSlot) {
                    mListener.onContentInvalidated();
                }
@@ -337,11 +342,14 @@ public class AlbumSlidingWindow implements AlbumView.ModelListener {
                if (mMediaItem != null) path = mMediaItem.getPath();
                mSelectionDrawer.draw(canvas, mContent, width, height,
                        getRotation(), path, mMediaType, mIsPanorama);
                if (mContent == mWaitLoadingTexture) {
                       mWaitLoadingDisplayed = true;
                }
                int result = 0;
                if (mFocusIndex == mSlotIndex) {
                    result |= RENDER_MORE_PASS;
                }
                if (mContent != mWaitLoadingTexture &&
                if ((mContent instanceof FadeInTexture) &&
                        ((FadeInTexture) mContent).isAnimating()) {
                    result |= RENDER_MORE_FRAME;
                }