diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 0da76874..db2a558f 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -98,10 +98,22 @@ public void onResume()
// '1' is the brightest. We attempt to maximize the brightness
// to help barcode readers scan the barcode.
Window window = getWindow();
- if(window != null && settings.useMaxBrightnessDisplayingBarcode())
+ if(window != null)
{
WindowManager.LayoutParams attributes = window.getAttributes();
- attributes.screenBrightness = 1F;
+
+ if (settings.useMaxBrightnessDisplayingBarcode())
+ {
+ attributes.screenBrightness = 1F;
+ }
+
+ if (settings.getKeepScreenOn())
+ {
+ window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON|
+ WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD|
+ WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+ }
+
window.setAttributes(attributes);
}
diff --git a/app/src/main/java/protect/card_locker/preferences/Settings.java b/app/src/main/java/protect/card_locker/preferences/Settings.java
index 4fe3c907..2f7d82e9 100644
--- a/app/src/main/java/protect/card_locker/preferences/Settings.java
+++ b/app/src/main/java/protect/card_locker/preferences/Settings.java
@@ -73,4 +73,9 @@ public boolean getLockBarcodeScreenOrientation()
{
return getBoolean(R.string.settings_key_lock_barcode_orientation, false);
}
+
+ public boolean getKeepScreenOn()
+ {
+ return getBoolean(R.string.settings_key_keep_screen_on, false);
+ }
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 831b3274..0dfec80f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -123,4 +123,6 @@
pref_display_card_max_brightness
Lock barcode orientation
pref_lock_barcode_orientation
+ Keep screen on
+ pref_keep_screen_on
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 20dad4d4..d42f0000 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -50,6 +50,11 @@
android:defaultValue="false"
android:key="@string/settings_key_lock_barcode_orientation"
android:title="@string/settings_lock_barcode_orientation"/>
+
+
\ No newline at end of file