summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/CameraActivity.java2
-rw-r--r--src/com/android/camera/WideAnglePanoramaModule.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 63a38f0a4..3f845db05 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1579,7 +1579,7 @@ public class CameraActivity extends Activity
int lower = Math.min(width, height);
- int offset = lower * 10 / 100;
+ int offset = lower * 7 / 100;
SETTING_LIST_WIDTH_1 = lower / 2 + offset;
SETTING_LIST_WIDTH_2 = lower / 2 - offset;
registerSDcardMountedReceiver();
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index eb02bb50f..0f7596af3 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -627,6 +627,7 @@ public class WideAnglePanoramaModule implements
mCaptureState = CAPTURE_STATE_VIEWFINDER;
if (!setupCamera()) {
+ CameraUtil.showErrorAndFinish(mActivity, R.string.cannot_connect_camera);
Log.e(TAG, "Failed to open camera, aborting");
return;
}