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

Commit 4edad0fb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "SnapdragonGallery: fix blank gray picture after modify"

parents 975dd5f4 4068763b

src/com/android/gallery3d/app/PhotoDataAdapter.java

+6 −1
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ public class PhotoDataAdapter implements PhotoPage.Model { 
    private int mCameraIndex;

    private boolean mIsPanorama;

    private boolean mIsStaticCamera;

    private boolean mIsFromTimelineScreen;

    private boolean mIsActive;

    private boolean mNeedFullImage;

    private int mFocusHintDirection = FOCUS_HINT_NEXT;
@@ -187,7 +188,7 @@ public class PhotoDataAdapter implements PhotoPage.Model { 
    // preview. If cameraIndex < 0, there is no camera preview.

    public PhotoDataAdapter(AbstractGalleryActivity activity, PhotoView view,

            MediaSet mediaSet, Path itemPath, int indexHint, int cameraIndex,

            boolean isPanorama, boolean isStaticCamera) {

            boolean isPanorama, boolean isStaticCamera, boolean isFromTimelineScreen) {

        mActivity = activity;

        mSource = Utils.checkNotNull(mediaSet);

        mPhotoView = Utils.checkNotNull(view);
@@ -196,6 +197,7 @@ public class PhotoDataAdapter implements PhotoPage.Model { 
        mCameraIndex = cameraIndex;

        mIsPanorama = isPanorama;

        mIsStaticCamera = isStaticCamera;

        mIsFromTimelineScreen = isFromTimelineScreen;

        mThreadPool = activity.getThreadPool();

        mNeedFullImage = true;
@@ -1307,6 +1309,9 @@ public class PhotoDataAdapter implements PhotoPage.Model { 
                }

                mDirty = false;

                version = mSource.reload();

                if (mIsFromTimelineScreen) {

                    mSource.setClusterKind(GalleryActivity.CLUSTER_ALBUMSET_NO_TITLE);

                }

                //if data is not ready, continue to reload

                if (version == MediaObject.INVALID_DATA_VERSION) {

                    continue;

src/com/android/gallery3d/app/PhotoPage.java

100644 → 100755
+2 −1
Original line number Diff line number Diff line
@@ -507,7 +507,8 @@ public abstract class PhotoPage extends ActivityState implements 
                    mActivity, mPhotoView, mMediaSet, itemPath, mCurrentIndex,

                    mAppBridge == null ? -1 : 0,

                    mAppBridge == null ? false : mAppBridge.isPanorama(),

                    mAppBridge == null ? false : mAppBridge.isStaticCamera());

                    mAppBridge == null ? false : mAppBridge.isStaticCamera(),

                    mIsFromTimelineScreen);

            mModel = pda;

            mPhotoView.setModel(mModel);