summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorJing (Mia) Wang <kaiyiz@codeaurora.org>2014-12-10 09:34:04 +0800
committerJing (Mia) Wang <kaiyiz@codeaurora.org>2014-12-10 09:34:04 +0800
commitdfbca43b618cf5b5849d7ec9909177ef62c602a0 (patch)
tree2a62597740ae4343e9c47832dcc47951a1f7327b /src/com
parent36dd26755a2fd13c20bc4267298f603e99c0e867 (diff)
downloadandroid_packages_apps_Snap-dfbca43b618cf5b5849d7ec9909177ef62c602a0.tar.gz
android_packages_apps_Snap-dfbca43b618cf5b5849d7ec9909177ef62c602a0.tar.bz2
android_packages_apps_Snap-dfbca43b618cf5b5849d7ec9909177ef62c602a0.zip
Camera: Add CameraGestureActivity as alias of CameraActivity
Make the activity could show above lock screen and turn on screen when it is started by gesture operation. Change-Id: I2099154f2325de83597b4262203c58a84b91f2d9
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/CameraActivity.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index b5fc0a676..4bcb84428 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1156,6 +1156,10 @@ public class CameraActivity extends Activity
getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
setContentView(R.layout.camera_filmstrip);
+ int flags = WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+ | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
+ getWindow().addFlags(flags);
+
mActionBar = getActionBar();
mActionBar.addOnMenuVisibilityListener(this);