diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-04-25 00:27:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-25 00:27:55 -0700 |
| commit | c5b144a4bace689d571f5cf0fa1640ec10df25b6 (patch) | |
| tree | 9fb002e864ba7e1071ebd92e222eb532db4ab337 /src/com | |
| parent | 9c0d475b44b9cb5209a95f3f4539c5803979890d (diff) | |
| parent | 0418bb55499c8dfdd6a7d95c1dbe40accaccc2ef (diff) | |
| download | android_packages_apps_Gallery2-c5b144a4bace689d571f5cf0fa1640ec10df25b6.tar.gz android_packages_apps_Gallery2-c5b144a4bace689d571f5cf0fa1640ec10df25b6.tar.bz2 android_packages_apps_Gallery2-c5b144a4bace689d571f5cf0fa1640ec10df25b6.zip | |
Merge "Revert "Gallery2: Set PhotoPage GL root reset when rotate"" into android_ui.lnx.1.2-dev
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/app/AbstractGalleryActivity.java | 9 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 9 |
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(); |