summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhuiyan <huiyan@codeaurora.org>2016-04-18 13:40:47 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-04-21 23:33:07 -0700
commit0418bb55499c8dfdd6a7d95c1dbe40accaccc2ef (patch)
treebacfee28c8c0c290f251df075b39036069d93059
parent136905c4e2fccedb967ca5ea7fe1b1123944be25 (diff)
downloadandroid_packages_apps_Gallery2-0418bb55499c8dfdd6a7d95c1dbe40accaccc2ef.tar.gz
android_packages_apps_Gallery2-0418bb55499c8dfdd6a7d95c1dbe40accaccc2ef.tar.bz2
android_packages_apps_Gallery2-0418bb55499c8dfdd6a7d95c1dbe40accaccc2ef.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
-rw-r--r--src/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 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();