generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Menu and style removed from sample.

Browse Source
This commit is contained in:
Alexander Smorkalov
2012-10-15 11:51:27 +04:00
committed by Andrey Kamaev
parent a32004f90c
commit 5f1339b319
5 changed files with 98 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/android/camera-preview/.classpath
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

6
samples/android/camera-preview/res/menu/activity_camera_writer.xml
View File

@@ -1,6 +0,0 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_settings"
android:title="@string/menu_settings"
android:orderInCategory="100"
android:showAsAction="never" />
</menu>

5
samples/android/camera-preview/res/values-v11/styles.xml
View File

@@ -1,5 +0,0 @@
<resources>
<style name="AppTheme" parent="android:Theme.Holo.Light" />
</resources>

10
samples/android/camera-preview/src/org/opencv/test/camerawriter/CameraWriterActivity.java
View File

@@ -9,7 +9,6 @@ import org.opencv.test.camerawriter.OpenCvCameraBridgeViewBase.CvCameraViewListe
import android.os.Bundle;
import android.app.Activity;
import android.util.Log;
import android.view.Menu;
public class CameraWriterActivity extends Activity implements CvCameraViewListener {
@@ -47,25 +46,16 @@ public class CameraWriterActivity extends Activity implements CvCameraViewListen
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.activity_camera_writer, menu);
return true;
}
@Override
public void onCameraViewStarted(int width, int height) {
// TODO Auto-generated method stub
}
@Override
public void onCameraViewStopped() {
// TODO Auto-generated method stub
}
@Override
public Mat onCameraFrame(Mat inputFrame) {
return inputFrame;
}

1
samples/android/camera-preview/src/org/opencv/test/camerawriter/OpenCvNativeCameraView.java
View File

@@ -104,7 +104,6 @@ public class OpenCvNativeCameraView extends OpenCvCameraBridgeViewBase {
mHeight = h;
}
@Override
public void run() {
Mat modified;