From 3e25c390208119beae0c38db8e94e4c3f3a3ef3d Mon Sep 17 00:00:00 2001 From: Johannes Schamburger Date: Tue, 22 Apr 2014 16:44:47 +0200 Subject: [PATCH 1/3] Fix Lint error (NewApi). --- .../zxingfragmentlib/camera/CameraConfigurationManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/com/welcu/android/zxingfragmentlib/camera/CameraConfigurationManager.java b/library/src/com/welcu/android/zxingfragmentlib/camera/CameraConfigurationManager.java index b445717..540db02 100644 --- a/library/src/com/welcu/android/zxingfragmentlib/camera/CameraConfigurationManager.java +++ b/library/src/com/welcu/android/zxingfragmentlib/camera/CameraConfigurationManager.java @@ -139,7 +139,7 @@ void setDesiredCameraParameters(Camera camera, boolean safeMode) { private void setOrientation(Camera camera, Camera.Parameters parameters) { if (view.getWidth() < view.getHeight()){ - if (Build.VERSION.SDK_INT==7) { + if (Build.VERSION.SDK_INT<=7) { parameters.set("orientation", "portrait"); parameters.setRotation(90); } else { From 809b63d3f9821c90e4c0a71aca2f089c4d0678be Mon Sep 17 00:00:00 2001 From: Johannes Schamburger Date: Mon, 28 Apr 2014 12:59:08 +0200 Subject: [PATCH 2/3] Fix NewApi Lint error (this time for real...). --- .../camera/CameraConfigurationManager.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/library/src/com/welcu/android/zxingfragmentlib/camera/CameraConfigurationManager.java b/library/src/com/welcu/android/zxingfragmentlib/camera/CameraConfigurationManager.java index 540db02..2eefd61 100644 --- a/library/src/com/welcu/android/zxingfragmentlib/camera/CameraConfigurationManager.java +++ b/library/src/com/welcu/android/zxingfragmentlib/camera/CameraConfigurationManager.java @@ -16,6 +16,7 @@ package com.welcu.android.zxingfragmentlib.camera; +import android.annotation.TargetApi; import android.content.Context; import android.content.SharedPreferences; import android.graphics.Point; @@ -140,14 +141,23 @@ void setDesiredCameraParameters(Camera camera, boolean safeMode) { private void setOrientation(Camera camera, Camera.Parameters parameters) { if (view.getWidth() < view.getHeight()){ if (Build.VERSION.SDK_INT<=7) { - parameters.set("orientation", "portrait"); - parameters.setRotation(90); + setOrientationBefore8(parameters); } else { - camera.setDisplayOrientation(90); + setOrientation8(camera); } } } + private void setOrientationBefore8(Camera.Parameters parameters) { + parameters.set("orientation", "portrait"); + parameters.setRotation(90); + } + + @TargetApi(Build.VERSION_CODES.FROYO) + private void setOrientation8(Camera camera) { + camera.setDisplayOrientation(90); + } + Point getCameraResolution() { return cameraResolution; } From 727b5fb7955a2230db4a2cb69bac5a28f2533ae2 Mon Sep 17 00:00:00 2001 From: Johannes Schamburger Date: Tue, 10 Jun 2014 12:01:17 +0200 Subject: [PATCH 3/3] Use current support-v4 library and current build tools to avoid problems with new Gradle version (0.11). --- library/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 7086388..9a60b57 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -5,7 +5,7 @@ repositories { } dependencies { - compile 'com.android.support:support-v4:19.0.0' + compile 'com.android.support:support-v4:19.1.0' compile files('libs/zxing-core-2.3.jar') @@ -13,7 +13,7 @@ dependencies { android { compileSdkVersion 19 - buildToolsVersion "19.0.0" + buildToolsVersion "19.1.0" sourceSets { main {