diff options
| author | Sascha Haeberling <haeberling@google.com> | 2012-10-15 18:28:42 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2012-10-17 11:22:03 -0700 |
| commit | c635f76f2155525b2bcca5cfdd1320d16a865876 (patch) | |
| tree | 3e83860a382b4657818827c4477c2f328ff057a5 /src/com/android/gallery3d/app/PhotoPage.java | |
| parent | 7fc37252be8d12de906a9c68224f553f80c8ef52 (diff) | |
| download | android_packages_apps_Snap-c635f76f2155525b2bcca5cfdd1320d16a865876.tar.gz android_packages_apps_Snap-c635f76f2155525b2bcca5cfdd1320d16a865876.tar.bz2 android_packages_apps_Snap-c635f76f2155525b2bcca5cfdd1320d16a865876.zip | |
Adds GMS Core PanoramaClient to Gallery
Bug: 7319099
Also updates the API call to LightCycleHelper.
This depends on http://go/ag/#/c/239523/
Change-Id: Ie951e44e3a474599d1da6fea52609fbb9f8dc9bc
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 413167fbb..169303c66 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -72,8 +72,8 @@ import com.android.gallery3d.ui.PhotoFallbackEffect; import com.android.gallery3d.ui.PhotoView; import com.android.gallery3d.ui.SelectionManager; import com.android.gallery3d.ui.SynchronizedHandler; +import com.android.gallery3d.ui.TiledScreenNail; import com.android.gallery3d.util.GalleryUtils; -import com.android.gallery3d.util.LightCycleHelper; public class PhotoPage extends ActivityState implements PhotoView.Listener, OrientationManager.Listener, AppBridge.Server, @@ -527,6 +527,7 @@ public class PhotoPage extends ActivityState implements } } + @Override public void onPictureCenter(boolean isCamera) { mPhotoView.setWantPictureCenterCallbacks(false); mHandler.removeMessages(MSG_ON_CAMERA_CENTER); @@ -534,10 +535,12 @@ public class PhotoPage extends ActivityState implements mHandler.sendEmptyMessage(isCamera ? MSG_ON_CAMERA_CENTER : MSG_ON_PICTURE_CENTER); } + @Override public boolean canDisplayBottomControls() { return mIsActive && !mPhotoView.getFilmMode(); } + @Override public boolean canDisplayBottomControl(int control) { if (mCurrentPhoto == null) return false; switch(control) { @@ -555,6 +558,7 @@ public class PhotoPage extends ActivityState implements } } + @Override public void onBottomControlClicked(int control) { switch(control) { case R.id.photopage_bottom_control_edit: @@ -562,7 +566,8 @@ public class PhotoPage extends ActivityState implements return; case R.id.photopage_bottom_control_panorama: mRecenterCameraOnResume = false; - LightCycleHelper.viewPanorama(mActivity, mCurrentPhoto.getContentUri()); + mActivity.getPanoramaViewHelper() + .showPanorama(mCurrentPhoto.getContentUri()); return; default: return; |