diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2015-01-09 13:09:03 +0800 |
|---|---|---|
| committer | kaiyiz <kaiyiz@codeaurora.org> | 2015-01-09 13:09:03 +0800 |
| commit | 3f873303a847f112558f081f42720a284558cace (patch) | |
| tree | 6228d5abe8e81f55bd229904348b992d01647f99 /AndroidManifest.xml | |
| parent | cc56779da62644898eb319d4b296f69d6d820013 (diff) | |
| download | android_packages_apps_Snap-3f873303a847f112558f081f42720a284558cace.tar.gz android_packages_apps_Snap-3f873303a847f112558f081f42720a284558cace.tar.bz2 android_packages_apps_Snap-3f873303a847f112558f081f42720a284558cace.zip | |
SnapdragonCamera: fix don't lock screen after press power key
The window flag FLAG_SHOW_WHEN_LOCKED is workding even if press power
key, so camera activity will not be close still run above locked screen
UI.
The CameraGestureActivity is start from screen off, so it will be a
SecureCameraActivity. Finish activity as same as the secure camera
activity.
Change-Id: I76d8ff3d2f037b81140b35255b52b4c4f4de95d3
CRs-Fixed: 777770
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bf13fac83..c827e6013 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -97,7 +97,7 @@ android:name="com.android.camera.CameraGestureActivity" android:icon="@mipmap/ic_launcher_camera" android:label="@string/camera_gesture_title" - android:targetActivity="com.android.camera.CameraActivity"> + android:targetActivity="com.android.camera.SecureCameraActivity"> <intent-filter> <action android:name="android.intent.action.MAIN" /> |