diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java index d16d68c0..7f505479 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java @@ -5,9 +5,11 @@ import android.content.Context; import android.os.Handler; import android.os.Looper; import android.support.test.InstrumentationRegistry; +import android.support.test.annotation.UiThreadTest; import android.support.test.rule.ActivityTestRule; import android.view.View; +import org.junit.Before; import org.junit.Rule; public class BaseTest { diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/TestActivity.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/TestActivity.java index a2b5ca13..acce6085 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/TestActivity.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/TestActivity.java @@ -2,11 +2,14 @@ package com.otaliastudios.cameraview; import android.app.Activity; +import android.app.KeyguardManager; +import android.content.Context; import android.os.Bundle; import android.os.PersistableBundle; import android.support.annotation.Nullable; import android.view.View; import android.view.ViewGroup; +import android.view.WindowManager; import android.widget.FrameLayout; import static android.view.ViewGroup.LayoutParams.*; @@ -19,9 +22,11 @@ public class TestActivity extends Activity { @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + wakeScreen(); // Match parent decor view. FrameLayout root = new FrameLayout(this); + root.setKeepScreenOn(true); root.setLayoutParams(new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)); // Inner content view with fixed size. @@ -34,6 +39,14 @@ public class TestActivity extends Activity { setContentView(root); } + public void wakeScreen() { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED + | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD + | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON + | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON + | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON); + } + public Size getContentSize() { return contentSize; }