Merge "Revert "Gallery2: Set PhotoPage GL root reset when rotate"" into android_ui.lnx.1.2-dev

2 files changed, 0 insertions, 18 deletions

diff --git a/src/com/android/gallery3d/app/AbstractGalleryActivity.java b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
index 08a3872e0..7a734e040 100644
--- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java
+++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
@@ -135,15 +135,6 @@ 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;
     }
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index f9db9fda5..ac89a03d1 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -1573,15 +1573,6 @@ 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();