summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhuiyan <huiyan@codeaurora.org>2016-04-18 13:40:47 +0800
committerSteve Kondik <steve@cyngn.com>2016-09-26 04:54:49 -0700
commitc9726f4dfea15dfa303086c90650534c32f5f3ec (patch)
tree2a3350e582735ee60fbd78f63ca15c2458c034c9
parent6bd8f200c0543dc83c79286fc0f5cfcd5eed40e8 (diff)
downloadandroid_packages_apps_Gallery2-c9726f4dfea15dfa303086c90650534c32f5f3ec.tar.gz
android_packages_apps_Gallery2-c9726f4dfea15dfa303086c90650534c32f5f3ec.tar.bz2
android_packages_apps_Gallery2-c9726f4dfea15dfa303086c90650534c32f5f3ec.zip
Revert "Gallery2: Set PhotoPage GL root reset when rotate"
This reverts commit 104f367812c753362c9c077d1d010e127e3be7f1. Change the orientation in SlideshowPage which is active, photoPage reload the data and invalidate UI in inactive state. This cause UI is black when return from SlideshowPage to PhotoPage. So revert it to avoid reloading data and invalidating UI, if PhotoPage is inactive state and the orientation change. Change-Id: Ia60af41662c60858d92d00fcacb6686a123c0e21 CRs-Fixed: 997153
-rw-r--r--src/com/android/gallery3d/app/AbstractGalleryActivity.java9
-rwxr-xr-xsrc/com/android/gallery3d/app/PhotoPage.java9
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 9f43b8de4..1f8fa1e66 100644
--- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java
+++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
@@ -156,15 +156,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 66120f02f..f53231f58 100755
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -1481,15 +1481,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();