summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-10-08 14:52:07 -0700
committerJohn Reck <jreck@google.com>2012-10-08 15:24:57 -0700
commit23c83737da80ba0b186440a8e649dfc8c5272eb0 (patch)
tree966cddee44c5be31e9d155b16dab166018cbad80
parent685bc7b98b1528ee177a277dfad4f5da8563fe25 (diff)
downloadandroid_packages_apps_Snap-23c83737da80ba0b186440a8e649dfc8c5272eb0.tar.gz
android_packages_apps_Snap-23c83737da80ba0b186440a8e649dfc8c5272eb0.tar.bz2
android_packages_apps_Snap-23c83737da80ba0b186440a8e649dfc8c5272eb0.zip
Use framework orientation
Bug: 7292373 Change-Id: I66e0c3a3b43a5d544ecc3fc9a4a04fa5521d36b2
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java22
-rw-r--r--src/com/android/gallery3d/ui/PhotoView.java3
2 files changed, 0 insertions, 25 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 3a97c53d7..aecbb161a 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -84,8 +84,6 @@ public class PhotoPage extends ActivityState implements
private static final String TAG = "PhotoPage";
private static final int MSG_HIDE_BARS = 1;
- private static final int MSG_LOCK_ORIENTATION = 2;
- private static final int MSG_UNLOCK_ORIENTATION = 3;
private static final int MSG_ON_FULL_SCREEN_CHANGED = 4;
private static final int MSG_UPDATE_ACTION_BAR = 5;
private static final int MSG_UNFREEZE_GLROOT = 6;
@@ -270,14 +268,6 @@ public class PhotoPage extends ActivityState implements
if (mBottomControls != null) mBottomControls.refresh();
break;
}
- case MSG_LOCK_ORIENTATION: {
- mOrientationManager.lockOrientation();
- break;
- }
- case MSG_UNLOCK_ORIENTATION: {
- mOrientationManager.unlockOrientation();
- break;
- }
case MSG_ON_FULL_SCREEN_CHANGED: {
mAppBridge.onFullScreenChanged(message.arg1 == 1);
break;
@@ -308,7 +298,6 @@ public class PhotoPage extends ActivityState implements
}
if (stayedOnCamera) {
- lockOrientation();
updateBars();
updateCurrentPhoto(mModel.getMediaItem(0));
}
@@ -347,7 +336,6 @@ public class PhotoPage extends ActivityState implements
mShowBars = false;
mInCameraRoll = true;
mAppBridge.setServer(this);
- mOrientationManager.lockOrientation();
// Get the ScreenNail from AppBridge and register it.
int id = SnailSource.newId();
@@ -1025,16 +1013,6 @@ public class PhotoPage extends ActivityState implements
}
@Override
- public void lockOrientation() {
- mHandler.sendEmptyMessage(MSG_LOCK_ORIENTATION);
- }
-
- @Override
- public void unlockOrientation() {
- mHandler.sendEmptyMessage(MSG_UNLOCK_ORIENTATION);
- }
-
- @Override
public void onActionBarAllowed(boolean allowed) {
mActionBarAllowed = allowed;
mHandler.sendEmptyMessage(MSG_UPDATE_ACTION_BAR);
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 7097dff28..8f5a84f6e 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -115,8 +115,6 @@ public class PhotoView extends GLView {
public interface Listener {
public void onSingleTapUp(int x, int y);
- public void lockOrientation();
- public void unlockOrientation();
public void onFullScreenChanged(boolean full);
public void onActionBarAllowed(boolean allowed);
public void onActionBarWanted();
@@ -1280,7 +1278,6 @@ public class PhotoView extends GLView {
boolean isCamera = mPictures.get(0).isCamera();
if (isCamera && !mFilmMode) {
// Move into camera in page mode, lock
- mListener.lockOrientation();
mListener.onActionBarAllowed(false);
} else {
mListener.onActionBarAllowed(true);