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

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

Merge "Gallery2: Set PhotoPage GL root reset when rotate"

parents ae5d449f 104f3678

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

+9 −0
Original line number Diff line number Diff line
@@ -133,6 +133,15 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext 
        return mGLRootView;

    }



    public void GLRootResume(boolean isResume) {

        if (isResume) {

            mGLRootView.onResume();

            mGLRootView.lockRenderThread();

        } else {

            mGLRootView.unlockRenderThread();

        }

    }



    public OrientationManager getOrientationManager() {

        return mOrientationManager;

    }

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

+9 −0
Original line number Diff line number Diff line
@@ -1630,6 +1630,15 @@ public abstract class PhotoPage extends ActivityState implements 
        }

    }



    @Override

    public void onConfigurationChanged(Configuration config) {

        super.onConfigurationChanged(config);

        if(mIsActive) return;

        mActivity.GLRootResume(true);

        mModel.resume();

        mActivity.GLRootResume(false);

    }



    @Override

    protected void onResume() {

        super.onResume();