diff options
| author | Your Name <jreck@google.com> | 2012-11-27 16:07:55 -0800 |
|---|---|---|
| committer | Your Name <jreck@google.com> | 2012-11-27 16:07:55 -0800 |
| commit | f12a6b9ea3932fb997d0d36605a2ba27de97beb3 (patch) | |
| tree | 4cfc3d20a304de5a06f62f015429859f80a3759c /src/com/android/gallery3d/app/PhotoPage.java | |
| parent | ee9ae401500daeafa76bf9d9e0d589eace4caca2 (diff) | |
| parent | 3c6a0610d50a866e520485163011c79d9ee62457 (diff) | |
| download | android_packages_apps_Gallery2-f12a6b9ea3932fb997d0d36605a2ba27de97beb3.tar.gz android_packages_apps_Gallery2-f12a6b9ea3932fb997d0d36605a2ba27de97beb3.tar.bz2 android_packages_apps_Gallery2-f12a6b9ea3932fb997d0d36605a2ba27de97beb3.zip | |
resolved conflicts for merge of 3c6a0610 to gb-ub-photos-bryce
Change-Id: Iac3fcc4a4b8c0295ec53edf5658169fb5fab021e
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 79bf0e0d7..76e050a75 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -73,7 +73,7 @@ import com.android.gallery3d.ui.SynchronizedHandler; import com.android.gallery3d.util.GalleryUtils; public abstract class PhotoPage extends ActivityState implements - PhotoView.Listener, OrientationManager.Listener, AppBridge.Server, + PhotoView.Listener, AppBridge.Server, PhotoPageBottomControls.Delegate, GalleryActionBar.OnAlbumModeSelectedListener { private static final String TAG = "PhotoPage"; @@ -286,7 +286,6 @@ public abstract class PhotoPage extends ActivityState implements mRootPane.addComponent(mPhotoView); mApplication = (GalleryApp) ((Activity) mActivity).getApplication(); mOrientationManager = mActivity.getOrientationManager(); - mOrientationManager.addListener(this); mActivity.getGLRoot().setOrientationSource(mOrientationManager); mHandler = new SynchronizedHandler(mActivity.getGLRoot()) { @@ -866,11 +865,6 @@ public abstract class PhotoPage extends ActivityState implements } @Override - public void onOrientationCompensationChanged() { - mActivity.getGLRoot().requestLayoutContentPane(); - } - - @Override protected void onBackPressed() { if (mShowDetails) { hideDetails(); @@ -1434,7 +1428,6 @@ public abstract class PhotoPage extends ActivityState implements mScreenNailSet = null; mScreenNailItem = null; } - mOrientationManager.removeListener(this); mActivity.getGLRoot().setOrientationSource(null); if (mBottomControls != null) mBottomControls.cleanup(); |