summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2016-01-10 15:36:41 +0100
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-01-10 20:36:33 -0800
commit42a806a3c4ec7d76ca4f4292c9d106eb2e1fdc17 (patch)
tree4dc8161a9c9003398140f44dafff136172cb4704 /src
parentf4f58540892ea529256de77f73f4948af82e8511 (diff)
downloadandroid_packages_apps_Snap-42a806a3c4ec7d76ca4f4292c9d106eb2e1fdc17.tar.gz
android_packages_apps_Snap-42a806a3c4ec7d76ca4f4292c9d106eb2e1fdc17.tar.bz2
android_packages_apps_Snap-42a806a3c4ec7d76ca4f4292c9d106eb2e1fdc17.zip
Snap: support setting default preview resolution via overlay
Change-Id: I14c17aec6e5d582cc1f884eba40868a58cab1d03
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoModule.java56
1 files changed, 13 insertions, 43 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index f456e592e..be187f416 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -3487,49 +3487,19 @@ public class PhotoModule
Size optimalSize = CameraUtil.getOptimalPreviewSize(mActivity, sizes,
(double) size.width / size.height);
- //Read Preview Resolution from adb command
- //value: 0(default) - Default value as per snapshot aspect ratio
- //value: 1 - 640x480
- //value: 2 - 720x480
- //value: 3 - 1280x720
- //value: 4 - 1920x1080
- //value: 5 - 2560x1440
- int preview_resolution = SystemProperties.getInt("persist.camera.preview.size", 0);
- switch (preview_resolution) {
- case 1: {
- optimalSize.width = 640;
- optimalSize.height = 480;
- Log.v(TAG, "Preview resolution hardcoded to 640x480");
- break;
- }
- case 2: {
- optimalSize.width = 720;
- optimalSize.height = 480;
- Log.v(TAG, "Preview resolution hardcoded to 720x480");
- break;
- }
- case 3: {
- optimalSize.width = 1280;
- optimalSize.height = 720;
- Log.v(TAG, "Preview resolution hardcoded to 1280x720");
- break;
- }
- case 4: {
- optimalSize.width = 1920;
- optimalSize.height = 1080;
- Log.v(TAG, "Preview resolution hardcoded to 1920x1080");
- break;
- }
- case 5: {
- optimalSize.width = 2560;
- optimalSize.height = 1440;
- Log.v(TAG, "Preview resolution hardcoded to 2560x1440");
- break;
- }
- default: {
- Log.v(TAG, "Preview resolution as per Snapshot aspect ratio");
- break;
- }
+ // Get default preview resolution from overlay
+ String previewSizeForPhoto =
+ mApplicationContext.getResources().getString(R.string.preview_size_for_photo);
+ try {
+ android.util.Size previewSize = android.util.Size.parseSize(previewSizeForPhoto);
+
+ optimalSize.width = previewSize.getWidth();
+ optimalSize.height = previewSize.getHeight();
+ Log.v(TAG, "Preview resolution hardcoded to " + optimalSize.width + "x" + optimalSize.height);
+ } catch (NumberFormatException e) {
+ Log.e(TAG, "Invalid preview resolution: " + previewSizeForPhoto);
+ } catch (NullPointerException e) {
+ Log.v(TAG, "No default preview resolution given");
}
Size original = mParameters.getPreviewSize();