Mercurial > repos > other > AceTorch

changeset 4:e63120e7b31d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure we don't get disabled while the torch is on - it'd be inconvenient!
author IBBoard <dev@ibboard.co.uk>
date Mon, 29 Oct 2012 14:07:40 +0000
parents 1c0184311e64
children 90bf295c3b98
files src/uk/co/ibboard/acetorch/AceTorchActivity.java
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
 		}
 	}