Video chat camera test app updates.
- Keep screen alive with Window Manager FLAG_KEEP_SCREEN_ON flag.
- Clear log buffer on each repeat of the test pass so the
memory doesn't grow forever.
Change-Id: Ifcd44fe49b4b7f736e964acf02c33534089f1647
diff --git a/CameraPreviewTest/res/layout/videochatcameratest_activity.xml b/CameraPreviewTest/res/layout/videochatcameratest_activity.xml
index 95cced5..a08e044 100644
--- a/CameraPreviewTest/res/layout/videochatcameratest_activity.xml
+++ b/CameraPreviewTest/res/layout/videochatcameratest_activity.xml
@@ -62,13 +62,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/qvga"
- android:checked="true" />
+ android:checked="false" />
<CheckBox android:id="@+id/vgacheckbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/vga"
- android:checked="false" />
+ android:checked="true" />
</LinearLayout>
diff --git a/CameraPreviewTest/src/com/example/android/videochatcameratest/VideoChatTestActivity.java b/CameraPreviewTest/src/com/example/android/videochatcameratest/VideoChatTestActivity.java
index 033b8b2..e638192 100644
--- a/CameraPreviewTest/src/com/example/android/videochatcameratest/VideoChatTestActivity.java
+++ b/CameraPreviewTest/src/com/example/android/videochatcameratest/VideoChatTestActivity.java
@@ -27,6 +27,8 @@
import android.view.TextureView;
import android.view.View;
import android.view.View.OnClickListener;
+import android.view.Window;
+import android.view.WindowManager;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.FrameLayout;
@@ -61,6 +63,10 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ Window window = getWindow();
+ window.setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
+ WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
// Inflate our UI from its XML layout description.
setContentView(R.layout.videochatcameratest_activity);
@@ -159,14 +165,13 @@
private class CameraTestRunner extends AsyncTask<Integer, String, Void> {
TextView mTextStatus;
- TextView mTextStatusHistory;
private int mDisplayOrientation;
+ private volatile boolean mClearStatusOnNextUpdate;
@Override
protected Void doInBackground(Integer... params) {
mDisplayOrientation = params[0];
mTextStatus = (TextView) findViewById(R.id.status);
- mTextStatusHistory = (TextView) findViewById(R.id.statushistory);
boolean testFrontCamera =
((CheckBox) findViewById(R.id.frontcameracheckbox)).isChecked();
boolean testBackCamera = ((CheckBox) findViewById(R.id.backcameracheckbox)).isChecked();
@@ -226,6 +231,7 @@
}
}
do {
+ mClearStatusOnNextUpdate = true;
for (Integer whichCamera : whichCameras) {
for (int whichResolution = 0; whichResolution < 2; whichResolution++) {
if (whichResolution == 0 && !testQVGA) {
@@ -482,6 +488,10 @@
@Override
protected void onProgressUpdate(String... message) {
+ if (mClearStatusOnNextUpdate) {
+ mClearStatusOnNextUpdate = false;
+ mTextStatusHistory.setText("");
+ }
Log.v(TAG, message[0]);
mTextStatus.setText(message[0]);
mTextStatusHistory.append(message[0] + "\r\n");
