From ba5811582ac488dc6ed7e98122e23d48fed727d7 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 1 Jun 2011 12:23:39 +0200 Subject: [PATCH] Fix non existing Android API calls from old sdk. --- src/org/linphone/DialerActivity.java | 2 +- src/org/linphone/IncallActivity.java | 25 +++++-------------- src/org/linphone/VideoCallActivity.java | 2 +- ...ordImpl.java => AndroidCameraRecord5.java} | 4 +-- .../core/video/AndroidCameraRecord8.java | 2 +- .../video/AndroidCameraRecordManager.java | 4 +-- submodules/linphone | 2 +- 7 files changed, 14 insertions(+), 27 deletions(-) rename src/org/linphone/core/video/{AndroidCameraRecordImpl.java => AndroidCameraRecord5.java} (96%) diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java index 2af5c28bd..3c46baeb4 100644 --- a/src/org/linphone/DialerActivity.java +++ b/src/org/linphone/DialerActivity.java @@ -301,7 +301,7 @@ public class DialerActivity extends SoftVolumeActivity implements LinphoneGuiLis @Override - protected Dialog onCreateDialog(int id, Bundle b) { + protected Dialog onCreateDialog(int id) { String from = LinphoneManager.getInstance().extractIncomingRemoteName(); View incomingCallView = getLayoutInflater().inflate(R.layout.incoming_call, null); diff --git a/src/org/linphone/IncallActivity.java b/src/org/linphone/IncallActivity.java index 25aa7d5de..e108d5c1f 100644 --- a/src/org/linphone/IncallActivity.java +++ b/src/org/linphone/IncallActivity.java @@ -129,28 +129,15 @@ public class IncallActivity extends SoftVolumeActivity implements OnClickListene } - // Go to home on Back key @Override - public boolean dispatchKeyEvent(KeyEvent event) { + public boolean onKeyUp(int keyCode, KeyEvent event) { if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) { - if (event.getAction() == KeyEvent.ACTION_DOWN - && event.getRepeatCount() == 0) { - // Tell the framework to start tracking this event. - numpad.getKeyDispatcherState().startTracking(event, this); - return true; - - } else if (event.getAction() == KeyEvent.ACTION_UP) { - numpad.getKeyDispatcherState().handleUpEvent(event); - if (event.isTracking() && !event.isCanceled()) { - startActivity(new Intent() - .setAction(Intent.ACTION_MAIN) - .addCategory(Intent.CATEGORY_HOME)); - return true; - } - } - return super.dispatchKeyEvent(event); + startActivity(new Intent() + .setAction(Intent.ACTION_MAIN) + .addCategory(Intent.CATEGORY_HOME)); + return true; } else { - return super.dispatchKeyEvent(event); + return super.onKeyUp(keyCode, event); } } } diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java index 901454ed3..9eff77c12 100644 --- a/src/org/linphone/VideoCallActivity.java +++ b/src/org/linphone/VideoCallActivity.java @@ -38,7 +38,7 @@ import android.view.SurfaceView; import android.view.ViewGroup.LayoutParams; /** - * For Android SDK >= + * For Android SDK >= 5 * @author Guillaume Beraudo * */ diff --git a/src/org/linphone/core/video/AndroidCameraRecordImpl.java b/src/org/linphone/core/video/AndroidCameraRecord5.java similarity index 96% rename from src/org/linphone/core/video/AndroidCameraRecordImpl.java rename to src/org/linphone/core/video/AndroidCameraRecord5.java index 3e68ab921..62af64b9f 100644 --- a/src/org/linphone/core/video/AndroidCameraRecordImpl.java +++ b/src/org/linphone/core/video/AndroidCameraRecord5.java @@ -35,7 +35,7 @@ import android.util.Log; * @author Guillaume Beraudo * */ -class AndroidCameraRecordImpl extends AndroidCameraRecord implements PreviewCallback { +class AndroidCameraRecord5 extends AndroidCameraRecord implements PreviewCallback { private long filterCtxPtr; private double timeElapsedBetweenFrames = 0; @@ -44,7 +44,7 @@ class AndroidCameraRecordImpl extends AndroidCameraRecord implements PreviewCall protected final int rotation; private MirrorType mirror; - public AndroidCameraRecordImpl(RecorderParams parameters) { + public AndroidCameraRecord5(RecorderParams parameters) { super(parameters); expectedTimeBetweenFrames = 1d / Math.round(parameters.fps); filterCtxPtr = parameters.filterDataNativePtr; diff --git a/src/org/linphone/core/video/AndroidCameraRecord8.java b/src/org/linphone/core/video/AndroidCameraRecord8.java index ef8425d7e..b62c63e97 100644 --- a/src/org/linphone/core/video/AndroidCameraRecord8.java +++ b/src/org/linphone/core/video/AndroidCameraRecord8.java @@ -30,7 +30,7 @@ import android.util.Log; * @author Guillaume Beraudo * */ -class AndroidCameraRecord8 extends AndroidCameraRecordImpl { +class AndroidCameraRecord8 extends AndroidCameraRecord5 { public AndroidCameraRecord8(RecorderParams parameters) { diff --git a/src/org/linphone/core/video/AndroidCameraRecordManager.java b/src/org/linphone/core/video/AndroidCameraRecordManager.java index d3c75f98f..8b4f1fc6d 100644 --- a/src/org/linphone/core/video/AndroidCameraRecordManager.java +++ b/src/org/linphone/core/video/AndroidCameraRecordManager.java @@ -196,7 +196,7 @@ public class AndroidCameraRecordManager { } else if (Version.sdkAboveOrEqual(8)) { recorder = new AndroidCameraRecord8(parameters); } else if (Version.sdkAboveOrEqual(5)) { - recorder = new AndroidCameraRecordImpl(parameters); + recorder = new AndroidCameraRecord5(parameters); } else { throw new RuntimeException("SDK version unsupported " + Version.sdk()); } @@ -228,7 +228,7 @@ public class AndroidCameraRecordManager { } if (Version.sdkAboveOrEqual(5)) { - supportedVideoSizes = AndroidCameraRecordImpl.oneShotSupportedVideoSizes(); + supportedVideoSizes = AndroidCameraRecord5.oneShotSupportedVideoSizes(); } // eventually null diff --git a/submodules/linphone b/submodules/linphone index 840856ca5..c097b9ab6 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 840856ca5545dd3e2a18a25db32ce3c00605803d +Subproject commit c097b9ab6319e2a7ef758032c0ed6d41e009bedb