aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2017-10-07 11:56:30 +0900
committerKazuki Yamaguchi <k@rhe.jp>2017-10-07 11:56:30 +0900
commit2caa5df5991f4733262ab6f419e25a8efce68542 (patch)
tree788a207dcbb056d6dde568bda40278c34c8f307c
parent15d4b9e5d13c8e39a135866fe9cbda70d83d5056 (diff)
downloadSmileEssence-2caa5df5991f4733262ab6f419e25a8efce68542.tar.gz
keep screen on
-rw-r--r--app/app.iml2
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt3
2 files changed, 4 insertions, 1 deletions
diff --git a/app/app.iml b/app/app.iml
index 57ec8e04..97c0a10b 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -55,7 +55,6 @@
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
@@ -64,6 +63,7 @@
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
index 1ff2464b..2fc0f8f7 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
@@ -33,6 +33,7 @@ import android.provider.MediaStore
import android.support.v4.view.ViewPager
import android.view.Menu
import android.view.MenuItem
+import android.view.WindowManager
import android.widget.ImageView
import de.keyboardsurfer.android.widget.crouton.Crouton
import kotlinx.android.synthetic.main.layout_main.*
@@ -198,6 +199,8 @@ class MainActivity : Activity(), ViewPager.OnPageChangeListener {
// start user stream
world.setupStreaming()
+
+ window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
}
private fun setTitle() {