diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2012-05-16 18:49:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-16 18:49:33 -0700 |
| commit | ff6687e68791b86eeda54194b6bcddffb69651da (patch) | |
| tree | 50f357155bc5ea6e8cd8e6b3cf72da7751e5a3b0 | |
| parent | cb1a39a26ae491185f92cf33fea0205331f8447f (diff) | |
| parent | 253c5aec7692afdd7880fbd169d4b44d5679cbc0 (diff) | |
| download | android_packages_apps_Gallery2-ff6687e68791b86eeda54194b6bcddffb69651da.tar.gz android_packages_apps_Gallery2-ff6687e68791b86eeda54194b6bcddffb69651da.tar.bz2 android_packages_apps_Gallery2-ff6687e68791b86eeda54194b6bcddffb69651da.zip | |
Merge "Handle layout change between pausing and resuming." into jb-dev
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 2022a6e2d..493e4aaf4 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -180,6 +180,7 @@ public class PhotoPage extends ActivityState implements if (mSetPathString != null) { mAppBridge = (AppBridge) data.getParcelable(KEY_APP_BRIDGE); if (mAppBridge != null) { + mAppBridge.setServer(this); mOrientationManager.lockOrientation(); // Get the ScreenNail from AppBridge and register it. @@ -729,7 +730,7 @@ public class PhotoPage extends ActivityState implements mHandler.removeMessages(MSG_UNFREEZE_GLROOT); super.onPause(); mIsActive = false; - if (mAppBridge != null) mAppBridge.setServer(null); + DetailsHelper.pause(); mPhotoView.pause(); mModel.pause(); @@ -760,7 +761,6 @@ public class PhotoPage extends ActivityState implements mActionBar.addOnMenuVisibilityListener(mMenuVisibilityListener); if (mAppBridge != null) { - mAppBridge.setServer(this); mPhotoView.resetToFirstPicture(); } mHandler.sendEmptyMessageDelayed(MSG_UNFREEZE_GLROOT, UNFREEZE_GLROOT_TIMEOUT); @@ -769,6 +769,7 @@ public class PhotoPage extends ActivityState implements @Override protected void onDestroy() { if (mAppBridge != null) { + mAppBridge.setServer(null); mScreenNailItem.setScreenNail(null); mAppBridge.detachScreenNail(); mAppBridge = null; |