summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
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 /AndroidManifest.xml
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 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml12
1 files changed, 12 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b92f8e798..bf13fac83 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -93,6 +93,18 @@
</intent-filter>
</activity-alias>
+ <activity-alias
+ android:name="com.android.camera.CameraGestureActivity"
+ android:icon="@mipmap/ic_launcher_camera"
+ android:label="@string/camera_gesture_title"
+ android:targetActivity="com.android.camera.CameraActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity-alias>
+
<!-- Video camera and capture use the Camcorder label and icon. -->
<activity-alias
android:name="com.android.camera.VideoCamera"