Android standalone: remove some usages of deprecated APIs and prevent further regressions.
Also:
- Fixed WebRTCDemo UI to say "SwitchToBack" at startup since default camera is front
- Rebuild WebRTCDemo APK when resources/layout/strings change
R=henrike@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2337004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4916 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java b/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java
index e2c9921..578bfa2 100644
--- a/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java
+++ b/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java
@@ -47,7 +47,6 @@
public static SurfaceView CreateLocalRenderer(Context context) {
SurfaceView localRender = new SurfaceView(context);
g_localRenderer = localRender.getHolder();
- g_localRenderer.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
return localRender;
}
diff --git a/video_engine/test/android/android_video_demo.gypi b/video_engine/test/android/android_video_demo.gypi
index fa53e51..868db96 100644
--- a/video_engine/test/android/android_video_demo.gypi
+++ b/video_engine/test/android/android_video_demo.gypi
@@ -50,6 +50,7 @@
'<(PRODUCT_DIR)/lib.java/video_render_module_java.jar',
'<(PRODUCT_DIR)/libwebrtc-video-demo-jni.so',
'<!@(find <(android_webrtc_demo_root)/src -name "*.java")',
+ '<!@(find <(android_webrtc_demo_root)/res -type f)',
],
'outputs': ['<(PRODUCT_DIR)/WebRTCDemo-debug.apk'],
'action': ['bash', '-ec',
diff --git a/video_engine/test/android/build.xml b/video_engine/test/android/build.xml
index 1febf2d..dc9c309 100644
--- a/video_engine/test/android/build.xml
+++ b/video_engine/test/android/build.xml
@@ -895,6 +895,10 @@
verbose="${verbose}"
classpathref="project.javac.classpath"
fork="${need.javac.fork}">
+ <!-- TODO(henrike): uncomment once WebRTCDemo stops using -->
+ <!-- (deprecated) TabActivity -->
+ <!-- <compilerarg value="-Xlint:all"/> -->
+ <!-- <compilerarg value="-Werror"/> -->
<src path="${source.absolute.dir}" />
<src path="${gen.absolute.dir}" />
<src path="${webrtc.modules.dir}/video_capture/android/java" />
diff --git a/video_engine/test/android/res/layout/both.xml b/video_engine/test/android/res/layout/both.xml
index d29d906..ab174ba 100644
--- a/video_engine/test/android/res/layout/both.xml
+++ b/video_engine/test/android/res/layout/both.xml
@@ -20,7 +20,7 @@
<Button android:id="@+id/btSwitchCamera"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="@string/frontCamera"
+ android:text="@string/backCamera"
android:layout_gravity="bottom"/>
<Button android:id="@+id/btStartStopCall"
android:layout_width="fill_parent"
diff --git a/video_engine/test/android/src/org/webrtc/videoengineapp/WebRTCDemo.java b/video_engine/test/android/src/org/webrtc/videoengineapp/WebRTCDemo.java
index dacdf45..84291d7 100644
--- a/video_engine/test/android/src/org/webrtc/videoengineapp/WebRTCDemo.java
+++ b/video_engine/test/android/src/org/webrtc/videoengineapp/WebRTCDemo.java
@@ -31,8 +31,6 @@
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
import android.util.Log;
import android.view.Display;
import android.view.Gravity;
@@ -67,10 +65,9 @@
import java.net.SocketException;
import java.util.Enumeration;
-/** {@} */
public class WebRTCDemo extends TabActivity implements IViEAndroidCallback,
- View.OnClickListener,
- OnItemSelectedListener {
+ View.OnClickListener,
+ OnItemSelectedListener {
private ViEAndroidJavaAPI vieAndroidAPI = null;
// remote renderer
@@ -187,8 +184,6 @@
private String webrtcName = "/webrtc";
private String webrtcDebugDir = null;
- private WakeLock wakeLock;
-
private boolean usingFrontCamera = true;
// The orientations (in degrees) of each of the cameras CCW-relative to the
// device, indexed by CameraInfo.CAMERA_FACING_{BACK,FRONT}, and -1
@@ -264,17 +259,12 @@
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE);
- getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
- WindowManager.LayoutParams.FLAG_FULLSCREEN);
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
populateCameraOrientations();
- PowerManager pm = (PowerManager) this.getSystemService(
- Context.POWER_SERVICE);
- wakeLock = pm.newWakeLock(
- PowerManager.SCREEN_DIM_WAKE_LOCK, TAG);
-
setContentView(R.layout.tabhost);
IntentFilter receiverFilter = new IntentFilter(Intent.ACTION_HEADSET_PLUG);
@@ -502,7 +492,9 @@
AlertDialog alertDialog = new AlertDialog.Builder(this).create();
alertDialog.setTitle("WebRTC Error");
alertDialog.setMessage("Can not init video engine.");
- alertDialog.setButton("OK", new DialogInterface.OnClickListener() {
+ alertDialog.setButton(
+ DialogInterface.BUTTON_POSITIVE,
+ "OK", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
return;
} });
@@ -848,12 +840,10 @@
if (viERunning || voERunning) {
stopAll();
startMain();
- wakeLock.release(); // release the wake lock
btStartStopCall.setText(R.string.startCall);
} else if (enableVoice || enableVideo){
++numCalls;
startCall();
- wakeLock.acquire(); // screen stay on during the call
btStartStopCall.setText(R.string.stopCall);
}
if (AUTO_CALL_RESTART_DELAY_MS > 0) {
