diff options
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index ef100fa29..300975845 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -178,7 +178,6 @@ public class CameraActivity extends Activity private Intent mResultDataForTesting; private OnScreenHint mStorageHint; private long mStorageSpaceBytes = Storage.LOW_STORAGE_THRESHOLD_BYTES; - private boolean mAutoRotateScreen; private boolean mSecureCamera; // This is a hack to speed up the start of SecureCamera. private static boolean sFirstStartAfterScreenOn = true; @@ -422,6 +421,7 @@ public class CameraActivity extends Activity if(!arePreviewControlsVisible()) { setPreviewControlsVisibility(true); CameraActivity.this.setSystemBarsVisibility(false); + mFilmStripView.getController().goToFullScreen(); } } @@ -1421,16 +1421,6 @@ public class CameraActivity extends Activity public void onResume() { if (mShutterVol >= 0 && mShutterVol <= 100) mAudioManager.setMasterVolume(mShutterVol,0); - // TODO: Handle this in OrientationManager. - // Auto-rotate off - if (Settings.System.getInt(getContentResolver(), - Settings.System.ACCELEROMETER_ROTATION, 0) == 0) { - setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); - mAutoRotateScreen = false; - } else { - setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR); - mAutoRotateScreen = true; - } UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA, UsageStatistics.ACTION_FOREGROUNDED, this.getClass().getSimpleName()); @@ -1543,10 +1533,6 @@ public class CameraActivity extends Activity mFilmStripView.setPreviewGestures(previewGestures); } - public boolean isAutoRotateScreen() { - return mAutoRotateScreen; - } - protected void updateStorageSpace() { mStorageSpaceBytes = Storage.getAvailableSpace(); if (Storage.switchSavePath()) { |