diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 11 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/WideAnglePanoramaUI.java | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 083b019c4..6a1f08597 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -820,10 +820,13 @@ public class PhotoMenu extends MenuController .findPreference(prefKey); if (pref == null) return; - // Hide the camera control while switching the camera. - // The camera control will be added back when - // onCameraPickerClicked is completed - mUI.hideUI(); + + if (prefKey.equals(CameraSettings.KEY_CAMERA_ID)) { + // Hide the camera control while switching the camera. + // The camera control will be added back when + // onCameraPickerClicked is completed + mUI.hideUI(); + } int index = pref.findIndexOfValue(pref.getValue()); CharSequence[] values = pref.getEntryValues(); index = (index + 1) % values.length; diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 9cb48eb0f..0f40702ce 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1548,7 +1548,7 @@ public class VideoModule implements CameraModule, // Profiles advertizes bitrate corresponding to published framerate. // In case framerate is different, scale the bitrate - int scaledBitrate = mProfile.videoBitRate * targetFrameRate / mProfile.videoFrameRate; + int scaledBitrate = mProfile.videoBitRate * (targetFrameRate / mProfile.videoFrameRate); Log.i(TAG, "Scaled Video bitrate : " + scaledBitrate); mMediaRecorder.setVideoEncodingBitRate(scaledBitrate); } diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java index 171036446..14907e842 100644 --- a/src/com/android/camera/WideAnglePanoramaUI.java +++ b/src/com/android/camera/WideAnglePanoramaUI.java @@ -639,7 +639,7 @@ public class WideAnglePanoramaUI implements + progressLayout.getChildAt(0).getHeight() / 2; int[] x = { r / 2, r / 10, r * 9 / 10, r / 2 }; - int[] y = { t / 2, (t + b1) / 2, (t + b1) / 2, b1 + pivotY }; + int[] y = { t / 2 + pivotY, (t + b1) / 2, (t + b1) / 2, b1 + pivotY }; int idx1, idx2; int g; |