summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2012-10-30 23:47:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-30 23:47:13 -0700
commit352b7fec00a6645cd70b9372ef967d7a0eddd290 (patch)
tree0a8ccdfe95ac291108fc150b73900735ecf8af93
parent9660f08aac2bcc332e8569e49ca32f2292cb638d (diff)
parent524dc9f19180d5f632cf594766b9b420f6ce529e (diff)
downloadandroid_packages_apps_Snap-352b7fec00a6645cd70b9372ef967d7a0eddd290.tar.gz
android_packages_apps_Snap-352b7fec00a6645cd70b9372ef967d7a0eddd290.tar.bz2
android_packages_apps_Snap-352b7fec00a6645cd70b9372ef967d7a0eddd290.zip
am 471d8986: Add keyguard camera widget meta-data to gallery manifest.
* commit '471d898606bc15878b4d1708236f60157bab08df': Add keyguard camera widget meta-data to gallery manifest.
-rw-r--r--AndroidManifest.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4ccb22435..b8b4461b0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -297,6 +297,8 @@
<action android:name="android.media.action.STILL_IMAGE_CAMERA" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ <meta-data android:name="com.android.keyguard.layout"
+ android:resource="@layout/keyguard_widget" />
</activity>
<activity android:name="com.android.camera.SecureCameraActivity"
@@ -316,6 +318,8 @@
<action android:name="android.media.action.IMAGE_CAPTURE_SECURE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ <meta-data android:name="com.android.keyguard.layout"
+ android:resource="@layout/keyguard_widget" />
</activity>
<activity-alias android:icon="@mipmap/ic_launcher_camera"