# HG changeset patch # User IBBoard # Date 1351519660 0 # Node ID e63120e7b31d0fc4132ea1b63fdbc0f00dcbc475 # Parent 1c0184311e649bfd1a63fc641afc9ace08a07561 Make sure we don't get disabled while the torch is on - it'd be inconvenient! diff -r 1c0184311e64 -r e63120e7b31d src/uk/co/ibboard/acetorch/AceTorchActivity.java --- a/src/uk/co/ibboard/acetorch/AceTorchActivity.java Mon Oct 29 13:41:02 2012 +0000 +++ b/src/uk/co/ibboard/acetorch/AceTorchActivity.java Mon Oct 29 14:07:40 2012 +0000 @@ -11,6 +11,7 @@ import android.hardware.Camera.Parameters; import android.os.Bundle; import android.view.View; +import android.view.WindowManager; import android.widget.Toast; import android.widget.ToggleButton; @@ -56,6 +57,8 @@ return; } + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + Parameters params = _camera.getParameters(); if (cameraHasTorchSupport(params)) { @@ -67,7 +70,7 @@ private void setNormalFlashOn(Parameters params) { params.setFlashMode(Parameters.FLASH_MODE_TORCH); - _camera.setParameters(params); + _camera.setParameters(params); } private boolean cameraHasTorchSupport(Parameters cameraParams) { @@ -100,6 +103,8 @@ } else { setWorkaroundFlashOff(); } + + getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); _camera = null; } }