diff options
| -rw-r--r-- | Android.mk | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | proguard.flags | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/AndroidCameraManagerImpl.java | 26 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/CameraManager.java | 15 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/PhotoModule.java | 22 | ||||
| -rwxr-xr-x[-rw-r--r--] | src_wrapper/org/codeaurora/snapcam/wrapper/CameraWrapper.java | 18 |
6 files changed, 57 insertions, 28 deletions
diff --git a/Android.mk b/Android.mk index 84d16b00f..474c3ec47 100644 --- a/Android.mk +++ b/Android.mk @@ -1,4 +1,3 @@ -ifneq ($(TARGET_USES_AOSP),true) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -46,4 +45,3 @@ endif include $(BUILD_PACKAGE) include $(call all-makefiles-under, $(LOCAL_PATH)) -endif diff --git a/proguard.flags b/proguard.flags index 9d477262a..522c66444 100644..100755 --- a/proguard.flags +++ b/proguard.flags @@ -3,6 +3,7 @@ #Avoid the library class dependency error -dontwarn android.view.inputmethod.InputMethodManager -dontwarn android.content.res.Resources +-dontwarn com.android.internal.widget.ViewInfoStore$InfoRecord # ctors of subclasses of CameraPreference are called with Java reflection. -keep class * extends com.android.camera.CameraPreference { @@ -57,3 +58,4 @@ } -keep class android.renderscript.** { *; } + diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java index a442d52d9..7c2bb836e 100644..100755 --- a/src/com/android/camera/AndroidCameraManagerImpl.java +++ b/src/com/android/camera/AndroidCameraManagerImpl.java @@ -39,8 +39,10 @@ import android.os.Looper; import android.os.Message; import android.util.Log; import android.view.SurfaceHolder; -import android.hardware.Camera$CameraDataCallback; -import android.hardware.Camera$CameraMetaDataCallback; +/* Disable_temporary +import android.hardware.Camera.CameraDataCallback; +import android.hardware.Camera.CameraMetaDataCallback; +*/ import com.android.camera.util.ApiHelper; import android.os.ConditionVariable; import java.lang.reflect.Method; @@ -391,11 +393,15 @@ class AndroidCameraManagerImpl implements CameraManager { return; case SET_HISTOGRAM_MODE: - CameraWrapper.setHistogramMode(mCamera, (Camera$CameraDataCallback) msg.obj); + /* Disable_temporary + CameraWrapper.setHistogramMode(mCamera, (Camera.CameraDataCallback) msg.obj); + */ break; case SEND_HISTOGRAM_DATA: + /* Disable_temporary CameraWrapper.sendHistogramData(mCamera); + */ break; case SET_LONGSHOT: @@ -403,8 +409,10 @@ class AndroidCameraManagerImpl implements CameraManager { break; case SET_AUTO_HDR_MODE: + /* Disable_temporary CameraWrapper.setMetadataCb(mCamera, - (Camera$CameraMetaDataCallback) msg.obj); + (Camera.CameraMetaDataCallback) msg.obj); + */ break; default: @@ -504,11 +512,11 @@ class AndroidCameraManagerImpl implements CameraManager { public void lock() { mCameraHandler.sendEmptyMessage(LOCK); } - + /* Disable_temporary @Override - public void setMetadataCb(Camera$CameraMetaDataCallback cb){ + public void setMetadataCb(Camera.CameraMetaDataCallback cb){ mCameraHandler.obtainMessage(SET_AUTO_HDR_MODE, cb).sendToTarget(); - } + } */ @Override public void setPreviewTexture(SurfaceTexture surfaceTexture) { @@ -664,10 +672,12 @@ class AndroidCameraManagerImpl implements CameraManager { new Boolean(enable)).sendToTarget(); } + /* Disable_temporary @Override - public void setHistogramMode(Camera$CameraDataCallback cb) { + public void setHistogramMode(Camera.CameraDataCallback cb) { mCameraHandler.obtainMessage(SET_HISTOGRAM_MODE, cb).sendToTarget(); } + */ @Override public void sendHistogramData() { mCameraHandler.sendEmptyMessage(SEND_HISTOGRAM_DATA); diff --git a/src/com/android/camera/CameraManager.java b/src/com/android/camera/CameraManager.java index 284f7d899..0239fb7b1 100644..100755 --- a/src/com/android/camera/CameraManager.java +++ b/src/com/android/camera/CameraManager.java @@ -25,8 +25,10 @@ import android.hardware.Camera.Parameters; import android.os.Build; import android.os.Handler; import android.view.SurfaceHolder; -import android.hardware.Camera$CameraDataCallback; -import android.hardware.Camera$CameraMetaDataCallback; +/* Disable_temporary +import android.hardware.Camera.CameraDataCallback; +import android.hardware.Camera.CameraMetaDataCallback; +*/ /** * An interface which provides possible camera device operations. * @@ -178,8 +180,9 @@ public interface CameraManager { * Sets the metadata cb * @cb Metadata callback object */ - public void setMetadataCb (Camera$CameraMetaDataCallback cb); - + /* + public void setMetadataCb (Camera.CameraMetaDataCallback cb); + */ /** * Reconnects to the camera device. * @see android.hardware.Camera#reconnect() @@ -371,7 +374,9 @@ public interface CameraManager { * * @param cb cameraDataCallback to use */ - public void setHistogramMode(Camera$CameraDataCallback cb); + /* Disable_temporary + public void setHistogramMode(Camera.CameraDataCallback cb); + */ /** * Send the Histogram Data. * diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 55fc005f8..7a8d1f6d6 100644..100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -328,8 +328,10 @@ public class PhotoModule : null; private final CameraErrorCallback mErrorCallback = new CameraErrorCallback(); + /* Disable_temporary private final StatsCallback mStatsCallback = new StatsCallback(); private final MetaDataCallback mMetaDataCallback = new MetaDataCallback(); + */ private long mFocusStartTime; private long mShutterCallbackTime; private long mPostViewPictureCallbackTime; @@ -1167,15 +1169,17 @@ public class PhotoModule } } } + + /* Disable_temporary private final class StatsCallback - implements android.hardware.Camera$CameraDataCallback { + implements android.hardware.Camera.CameraDataCallback { @Override public void onCameraData(int [] data, android.hardware.Camera camera) { //if(!mPreviewing || !mHiston || !mFirstTimeInitialized){ if(!mHiston || !mFirstTimeInitialized){ return; } - /*The first element in the array stores max hist value . Stats data begin from second value*/ + //The first element in the array stores max hist value . Stats data begin from second value synchronized(statsdata) { System.arraycopy(data,0,statsdata,0,STATS_DATA); } @@ -1189,7 +1193,7 @@ public class PhotoModule } private final class MetaDataCallback - implements android.hardware.Camera$CameraMetaDataCallback{ + implements android.hardware.Camera.CameraMetaDataCallback{ @Override public void onCameraMetaData (byte[] data, android.hardware.Camera camera) { int metadata[] = new int[3]; @@ -1197,7 +1201,7 @@ public class PhotoModule for (int i =0;i<3;i++) { metadata[i] = byteToInt( (byte []) data, i*4); } - /* Checking if the meta data is for auto HDR */ + // Checking if the meta data is for auto HDR if (metadata[0] == 3) { if (metadata[2] == 1) { mAutoHdrEnable = true; @@ -1229,7 +1233,7 @@ public class PhotoModule } return value; } - } + } */ private final class PostViewPictureCallback implements CameraPictureCallback { @@ -1729,7 +1733,9 @@ public class PhotoModule if(mHiston) { if (mSnapshotMode != CameraInfoWrapper.CAMERA_SUPPORT_MODE_ZSL) { mHiston = false; + /* Disable_temporary mCameraDevice.setHistogramMode(null); + */ } mActivity.runOnUiThread(new Runnable() { public void run() { @@ -3609,7 +3615,9 @@ public class PhotoModule } }); mParameters.setSceneMode("asd"); + /* Disable_temporary mCameraDevice.setMetadataCb(mMetaDataCallback); + */ } else { mAutoHdrEnable = false; @@ -3711,7 +3719,9 @@ public class PhotoModule } } }); + /* Disable_temporary mCameraDevice.setHistogramMode(mStatsCallback); + */ mHiston = true; } else { mHiston = false; @@ -3721,7 +3731,9 @@ public class PhotoModule mGraphView.setVisibility(View.INVISIBLE); } }); + /* Disable_temporary mCameraDevice.setHistogramMode(null); + */ } } diff --git a/src_wrapper/org/codeaurora/snapcam/wrapper/CameraWrapper.java b/src_wrapper/org/codeaurora/snapcam/wrapper/CameraWrapper.java index 11d90460a..2f1a1daf6 100644..100755 --- a/src_wrapper/org/codeaurora/snapcam/wrapper/CameraWrapper.java +++ b/src_wrapper/org/codeaurora/snapcam/wrapper/CameraWrapper.java @@ -46,13 +46,16 @@ import android.hardware.Camera.ShutterCallback; import android.util.Log; import android.view.SurfaceHolder; -import android.hardware.Camera$CameraMetaDataCallback; -import android.hardware.Camera$CameraDataCallback; +/* Disable_temporary +import android.hardware.Camera.CameraMetaDataCallback; +import android.hardware.Camera.CameraDataCallback; +*/ public class CameraWrapper extends Wrapper{ + /* Disable_temporary private static Method method_setMetadataCb = null; - public static final void setMetadataCb(Camera camera, Camera$CameraMetaDataCallback cb){ + public static final void setMetadataCb(Camera camera, Camera.CameraMetaDataCallback cb){ if ( DEBUG ){ Log.e(TAG, "" + Camera.class + " no setMetadataCb"); return; @@ -60,7 +63,7 @@ public class CameraWrapper extends Wrapper{ try{ if ( method_setMetadataCb == null ){ method_setMetadataCb = Camera.class.getMethod("setMetadataCb", - android.hardware.Camera$CameraMetaDataCallback.class); + android.hardware.Camera.CameraMetaDataCallback.class); } method_setMetadataCb.invoke(camera, cb); }catch (Exception exception){ @@ -68,9 +71,8 @@ public class CameraWrapper extends Wrapper{ } } - private static Method method_setHistogramMode = null; - public static final void setHistogramMode(Camera camera, Camera$CameraDataCallback cb) { + public static final void setHistogramMode(Camera camera, Camera.CameraDataCallback cb) { if ( DEBUG ){ Log.e(TAG, "" + Camera.class + " no setHistogramMode"); return; @@ -78,7 +80,7 @@ public class CameraWrapper extends Wrapper{ try{ if ( method_setHistogramMode == null ){ method_setHistogramMode = Camera.class.getMethod("setHistogramMode", - android.hardware.Camera$CameraDataCallback.class); + android.hardware.Camera.CameraDataCallback.class); } method_setHistogramMode.invoke(camera, cb); }catch (Exception exception){ @@ -100,7 +102,7 @@ public class CameraWrapper extends Wrapper{ }catch (Exception exception){ exception.printStackTrace(); } - } + }*/ private static Method method_setLongshot = null; public static final void setLongshot(Camera camera, boolean enable){ |