Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
081887ee
Commit
081887ee
authored
Nov 23, 2012
by
Andrey Kamaev
Committed by
OpenCV Buildbot
Nov 23, 2012
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #174 from asmorkalov:full_sreen_fix
parents
8579666b
2c67731a
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
39 additions
and
22 deletions
+39
-22
AndroidManifest.xml
samples/android/15-puzzle/AndroidManifest.xml
+2
-1
Puzzle15Activity.java
...zle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java
+2
-2
AndroidManifest.xml
samples/android/color-blob-detection/AndroidManifest.xml
+5
-1
AndroidManifest.xml
samples/android/face-detection/AndroidManifest.xml
+5
-1
FdActivity.java
...tection/src/org/opencv/samples/facedetect/FdActivity.java
+0
-2
AndroidManifest.xml
samples/android/image-manipulations/AndroidManifest.xml
+5
-1
ImageManipulationsActivity.java
...amples/imagemanipulations/ImageManipulationsActivity.java
+0
-2
AndroidManifest.xml
samples/android/tutorial-1-addopencv/AndroidManifest.xml
+5
-1
Sample1Java.java
...dopencv/src/org/opencv/samples/tutorial1/Sample1Java.java
+0
-2
AndroidManifest.xml
samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
+5
-1
Sample2NativeCamera.java
...src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
+0
-2
AndroidManifest.xml
samples/android/tutorial-3-native/AndroidManifest.xml
+5
-1
Sample3Native.java
...ative/src/org/opencv/samples/tutorial3/Sample3Native.java
+0
-2
AndroidManifest.xml
samples/android/tutorial-4-mixed/AndroidManifest.xml
+5
-1
Sample4Mixed.java
...-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
+0
-2
No files found.
samples/android/15-puzzle/AndroidManifest.xml
View file @
081887ee
...
@@ -7,7 +7,8 @@
...
@@ -7,7 +7,8 @@
<application
<application
android:icon=
"@drawable/icon"
android:icon=
"@drawable/icon"
android:label=
"@string/app_name"
>
android:label=
"@string/app_name"
android:theme=
"@android:style/Theme.NoTitleBar.Fullscreen"
>
<activity
<activity
android:name=
".Puzzle15Activity"
android:name=
".Puzzle15Activity"
...
...
samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java
View file @
081887ee
...
@@ -13,8 +13,8 @@ import android.util.Log;
...
@@ -13,8 +13,8 @@ import android.util.Log;
import
android.view.Menu
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.MotionEvent
;
import
android.view.MotionEvent
;
import
android.view.Window
;
import
android.view.View
;
import
android.view.View
;
import
android.view.WindowManager
;
public
class
Puzzle15Activity
extends
Activity
implements
CvCameraViewListener
,
View
.
OnTouchListener
{
public
class
Puzzle15Activity
extends
Activity
implements
CvCameraViewListener
,
View
.
OnTouchListener
{
...
@@ -50,7 +50,7 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener,
...
@@ -50,7 +50,7 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener,
@Override
@Override
public
void
onCreate
(
Bundle
savedInstanceState
)
{
public
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
requestWindowFeature
(
Window
.
FEATURE_NO_TITLE
);
getWindow
().
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_KEEP_SCREEN_ON
);
setContentView
(
R
.
layout
.
activity_puzzle15
);
setContentView
(
R
.
layout
.
activity_puzzle15
);
...
...
samples/android/color-blob-detection/AndroidManifest.xml
View file @
081887ee
...
@@ -4,7 +4,11 @@
...
@@ -4,7 +4,11 @@
android:versionCode=
"21"
android:versionCode=
"21"
android:versionName=
"2.1"
>
android:versionName=
"2.1"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/icon"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/icon"
android:theme=
"@android:style/Theme.NoTitleBar.Fullscreen"
>
<activity
android:name=
"ColorBlobDetectionActivity"
<activity
android:name=
"ColorBlobDetectionActivity"
android:label=
"@string/app_name"
android:label=
"@string/app_name"
android:screenOrientation=
"landscape"
android:screenOrientation=
"landscape"
...
...
samples/android/face-detection/AndroidManifest.xml
View file @
081887ee
...
@@ -4,7 +4,11 @@
...
@@ -4,7 +4,11 @@
android:versionCode=
"21"
android:versionCode=
"21"
android:versionName=
"2.1"
>
android:versionName=
"2.1"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/icon"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/icon"
android:theme=
"@android:style/Theme.NoTitleBar.Fullscreen"
>
<activity
android:name=
"FdActivity"
<activity
android:name=
"FdActivity"
android:label=
"@string/app_name"
android:label=
"@string/app_name"
android:screenOrientation=
"landscape"
android:screenOrientation=
"landscape"
...
...
samples/android/face-detection/src/org/opencv/samples/facedetect/FdActivity.java
View file @
081887ee
...
@@ -25,7 +25,6 @@ import android.os.Bundle;
...
@@ -25,7 +25,6 @@ import android.os.Bundle;
import
android.util.Log
;
import
android.util.Log
;
import
android.view.Menu
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.Window
;
import
android.view.WindowManager
;
import
android.view.WindowManager
;
public
class
FdActivity
extends
Activity
implements
CvCameraViewListener
{
public
class
FdActivity
extends
Activity
implements
CvCameraViewListener
{
...
@@ -120,7 +119,6 @@ public class FdActivity extends Activity implements CvCameraViewListener {
...
@@ -120,7 +119,6 @@ public class FdActivity extends Activity implements CvCameraViewListener {
public
void
onCreate
(
Bundle
savedInstanceState
)
{
public
void
onCreate
(
Bundle
savedInstanceState
)
{
Log
.
i
(
TAG
,
"called onCreate"
);
Log
.
i
(
TAG
,
"called onCreate"
);
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
requestWindowFeature
(
Window
.
FEATURE_NO_TITLE
);
getWindow
().
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_KEEP_SCREEN_ON
);
getWindow
().
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_KEEP_SCREEN_ON
);
setContentView
(
R
.
layout
.
face_detect_surface_view
);
setContentView
(
R
.
layout
.
face_detect_surface_view
);
...
...
samples/android/image-manipulations/AndroidManifest.xml
View file @
081887ee
...
@@ -4,7 +4,11 @@
...
@@ -4,7 +4,11 @@
android:versionCode=
"21"
android:versionCode=
"21"
android:versionName=
"2.1"
>
android:versionName=
"2.1"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/icon"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/icon"
android:theme=
"@android:style/Theme.NoTitleBar.Fullscreen"
>
<activity
android:name=
"ImageManipulationsActivity"
<activity
android:name=
"ImageManipulationsActivity"
android:label=
"@string/app_name"
android:label=
"@string/app_name"
android:screenOrientation=
"landscape"
android:screenOrientation=
"landscape"
...
...
samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
View file @
081887ee
...
@@ -22,7 +22,6 @@ import android.os.Bundle;
...
@@ -22,7 +22,6 @@ import android.os.Bundle;
import
android.util.Log
;
import
android.util.Log
;
import
android.view.Menu
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.Window
;
import
android.view.WindowManager
;
import
android.view.WindowManager
;
public
class
ImageManipulationsActivity
extends
Activity
implements
CvCameraViewListener
{
public
class
ImageManipulationsActivity
extends
Activity
implements
CvCameraViewListener
{
...
@@ -101,7 +100,6 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView
...
@@ -101,7 +100,6 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView
public
void
onCreate
(
Bundle
savedInstanceState
)
{
public
void
onCreate
(
Bundle
savedInstanceState
)
{
Log
.
i
(
TAG
,
"called onCreate"
);
Log
.
i
(
TAG
,
"called onCreate"
);
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
requestWindowFeature
(
Window
.
FEATURE_NO_TITLE
);
getWindow
().
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_KEEP_SCREEN_ON
);
getWindow
().
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_KEEP_SCREEN_ON
);
setContentView
(
R
.
layout
.
image_manipulations_surface_view
);
setContentView
(
R
.
layout
.
image_manipulations_surface_view
);
...
...
samples/android/tutorial-1-addopencv/AndroidManifest.xml
View file @
081887ee
...
@@ -4,7 +4,11 @@
...
@@ -4,7 +4,11 @@
android:versionCode=
"21"
android:versionCode=
"21"
android:versionName=
"2.1"
>
android:versionName=
"2.1"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/icon"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/icon"
android:theme=
"@android:style/Theme.NoTitleBar.Fullscreen"
>
<activity
android:name=
"Sample1Java"
<activity
android:name=
"Sample1Java"
android:label=
"@string/app_name"
android:label=
"@string/app_name"
android:screenOrientation=
"landscape"
android:screenOrientation=
"landscape"
...
...
samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java
View file @
081887ee
...
@@ -13,7 +13,6 @@ import android.util.Log;
...
@@ -13,7 +13,6 @@ import android.util.Log;
import
android.view.Menu
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.SurfaceView
;
import
android.view.SurfaceView
;
import
android.view.Window
;
import
android.view.WindowManager
;
import
android.view.WindowManager
;
import
android.widget.Toast
;
import
android.widget.Toast
;
...
@@ -50,7 +49,6 @@ public class Sample1Java extends Activity implements CvCameraViewListener {
...
@@ -50,7 +49,6 @@ public class Sample1Java extends Activity implements CvCameraViewListener {
public
void
onCreate
(
Bundle
savedInstanceState
)
{
public
void
onCreate
(
Bundle
savedInstanceState
)
{
Log
.
i
(
TAG
,
"called onCreate"
);
Log
.
i
(
TAG
,
"called onCreate"
);
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
requestWindowFeature
(
Window
.
FEATURE_NO_TITLE
);
getWindow
().
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_KEEP_SCREEN_ON
);
getWindow
().
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_KEEP_SCREEN_ON
);
setContentView
(
R
.
layout
.
tutorial1_surface_view
);
setContentView
(
R
.
layout
.
tutorial1_surface_view
);
...
...
samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
View file @
081887ee
...
@@ -4,7 +4,11 @@
...
@@ -4,7 +4,11 @@
android:versionCode=
"21"
android:versionCode=
"21"
android:versionName=
"2.1"
>
android:versionName=
"2.1"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/icon"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/icon"
android:theme=
"@android:style/Theme.NoTitleBar.Fullscreen"
>
<activity
android:name=
"Sample2NativeCamera"
<activity
android:name=
"Sample2NativeCamera"
android:label=
"@string/app_name"
android:label=
"@string/app_name"
android:screenOrientation=
"landscape"
android:screenOrientation=
"landscape"
...
...
samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
View file @
081887ee
...
@@ -18,7 +18,6 @@ import android.os.Bundle;
...
@@ -18,7 +18,6 @@ import android.os.Bundle;
import
android.util.Log
;
import
android.util.Log
;
import
android.view.Menu
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.Window
;
import
android.view.WindowManager
;
import
android.view.WindowManager
;
public
class
Sample2NativeCamera
extends
Activity
implements
CvCameraViewListener
{
public
class
Sample2NativeCamera
extends
Activity
implements
CvCameraViewListener
{
...
@@ -63,7 +62,6 @@ public class Sample2NativeCamera extends Activity implements CvCameraViewListene
...
@@ -63,7 +62,6 @@ public class Sample2NativeCamera extends Activity implements CvCameraViewListene
public
void
onCreate
(
Bundle
savedInstanceState
)
{
public
void
onCreate
(
Bundle
savedInstanceState
)
{
Log
.
i
(
TAG
,
"called onCreate"
);
Log
.
i
(
TAG
,
"called onCreate"
);
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
requestWindowFeature
(
Window
.
FEATURE_NO_TITLE
);
getWindow
().
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_KEEP_SCREEN_ON
);
getWindow
().
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_KEEP_SCREEN_ON
);
setContentView
(
R
.
layout
.
tutorial2_surface_view
);
setContentView
(
R
.
layout
.
tutorial2_surface_view
);
...
...
samples/android/tutorial-3-native/AndroidManifest.xml
View file @
081887ee
...
@@ -4,7 +4,11 @@
...
@@ -4,7 +4,11 @@
android:versionCode=
"21"
android:versionCode=
"21"
android:versionName=
"2.1"
>
android:versionName=
"2.1"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/icon"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/icon"
android:theme=
"@android:style/Theme.NoTitleBar.Fullscreen"
>
<activity
android:name=
"Sample3Native"
<activity
android:name=
"Sample3Native"
android:label=
"@string/app_name"
android:label=
"@string/app_name"
android:screenOrientation=
"landscape"
android:screenOrientation=
"landscape"
...
...
samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java
View file @
081887ee
...
@@ -12,7 +12,6 @@ import org.opencv.imgproc.Imgproc;
...
@@ -12,7 +12,6 @@ import org.opencv.imgproc.Imgproc;
import
android.app.Activity
;
import
android.app.Activity
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.util.Log
;
import
android.util.Log
;
import
android.view.Window
;
import
android.view.WindowManager
;
import
android.view.WindowManager
;
public
class
Sample3Native
extends
Activity
implements
CvCameraViewListener
{
public
class
Sample3Native
extends
Activity
implements
CvCameraViewListener
{
...
@@ -52,7 +51,6 @@ public class Sample3Native extends Activity implements CvCameraViewListener {
...
@@ -52,7 +51,6 @@ public class Sample3Native extends Activity implements CvCameraViewListener {
public
void
onCreate
(
Bundle
savedInstanceState
)
{
public
void
onCreate
(
Bundle
savedInstanceState
)
{
Log
.
i
(
TAG
,
"called onCreate"
);
Log
.
i
(
TAG
,
"called onCreate"
);
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
requestWindowFeature
(
Window
.
FEATURE_NO_TITLE
);
getWindow
().
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_KEEP_SCREEN_ON
);
getWindow
().
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_KEEP_SCREEN_ON
);
setContentView
(
R
.
layout
.
tutorial3_surface_view
);
setContentView
(
R
.
layout
.
tutorial3_surface_view
);
...
...
samples/android/tutorial-4-mixed/AndroidManifest.xml
View file @
081887ee
...
@@ -4,7 +4,11 @@
...
@@ -4,7 +4,11 @@
android:versionCode=
"21"
android:versionCode=
"21"
android:versionName=
"2.1"
>
android:versionName=
"2.1"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/icon"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/icon"
android:theme=
"@android:style/Theme.NoTitleBar.Fullscreen"
>
<activity
android:name=
"Sample4Mixed"
<activity
android:name=
"Sample4Mixed"
android:label=
"@string/app_name"
android:label=
"@string/app_name"
android:screenOrientation=
"landscape"
android:screenOrientation=
"landscape"
...
...
samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
View file @
081887ee
...
@@ -15,7 +15,6 @@ import android.os.Bundle;
...
@@ -15,7 +15,6 @@ import android.os.Bundle;
import
android.util.Log
;
import
android.util.Log
;
import
android.view.Menu
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.Window
;
import
android.view.WindowManager
;
import
android.view.WindowManager
;
public
class
Sample4Mixed
extends
Activity
implements
CvCameraViewListener
{
public
class
Sample4Mixed
extends
Activity
implements
CvCameraViewListener
{
...
@@ -68,7 +67,6 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener {
...
@@ -68,7 +67,6 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener {
public
void
onCreate
(
Bundle
savedInstanceState
)
{
public
void
onCreate
(
Bundle
savedInstanceState
)
{
Log
.
i
(
TAG
,
"called onCreate"
);
Log
.
i
(
TAG
,
"called onCreate"
);
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
requestWindowFeature
(
Window
.
FEATURE_NO_TITLE
);
getWindow
().
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_KEEP_SCREEN_ON
);
getWindow
().
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_KEEP_SCREEN_ON
);
setContentView
(
R
.
layout
.
tutorial4_surface_view
);
setContentView
(
R
.
layout
.
tutorial4_surface_view
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment