Menu and style removed from sample.

pull/80/head
Alexander Smorkalov 13 years ago committed by Andrey Kamaev
parent a32004f90c
commit 5f1339b319
  1. 4
      samples/android/camera-preview/.classpath
  2. 6
      samples/android/camera-preview/res/menu/activity_camera_writer.xml
  3. 5
      samples/android/camera-preview/res/values-v11/styles.xml
  4. 10
      samples/android/camera-preview/src/org/opencv/test/camerawriter/CameraWriterActivity.java
  5. 1
      samples/android/camera-preview/src/org/opencv/test/camerawriter/OpenCvNativeCameraView.java

@ -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>

@ -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>

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

@ -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;
}

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

Loading…
Cancel
Save