diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-12-16 01:42:19 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-12-16 01:42:19 -0800 |
| commit | 9199f3752b05ea47157d58b48a278c6288fe2d5c (patch) | |
| tree | 8cc36ec22ce98a783d882656412514538c6dc409 /src/com/android/camera | |
| parent | b8a211285617dbecc49cf391db9219d82f38bdfd (diff) | |
| parent | dfbca43b618cf5b5849d7ec9909177ef62c602a0 (diff) | |
| download | android_packages_apps_Snap-9199f3752b05ea47157d58b48a278c6288fe2d5c.tar.gz android_packages_apps_Snap-9199f3752b05ea47157d58b48a278c6288fe2d5c.tar.bz2 android_packages_apps_Snap-9199f3752b05ea47157d58b48a278c6288fe2d5c.zip | |
Merge "Camera: Add CameraGestureActivity as alias of CameraActivity"
Diffstat (limited to 'src/com/android/camera')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 3c4a93a18..b85a7de06 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1158,6 +1158,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); |