diff options
author | Mangesh Ghiware <mghiware@google.com> | 2013-08-14 04:14:35 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-14 04:14:36 +0000 |
commit | a34e8c7d439d17355df51e5e536bdbbd1744cc74 (patch) | |
tree | e0f3e68d8dc886551a4bfb2b988c62a7e329b035 | |
parent | dcccc510652b835fdbd39310a07849af8203052a (diff) | |
parent | acd4e11ac09816721ebbbed0811c0fdf93ada9cf (diff) | |
download | android_packages_apps_Snap-a34e8c7d439d17355df51e5e536bdbbd1744cc74.tar.gz android_packages_apps_Snap-a34e8c7d439d17355df51e5e536bdbbd1744cc74.tar.bz2 android_packages_apps_Snap-a34e8c7d439d17355df51e5e536bdbbd1744cc74.zip |
Merge "Add activity-alias for Camera." into gb-ub-photos-carlsbad
-rw-r--r-- | AndroidManifest.xml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b7748dfe3..7eed9c8c8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -71,17 +71,25 @@ <action android:name="android.media.action.VIDEO_CAPTURE" /> <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:name="com.android.camera.CameraLauncher" + android:icon="@mipmap/ic_launcher_camera" + android:label="@string/app_name" + android:targetActivity="com.android.camera.CameraActivity"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> + </activity-alias> - <meta-data - android:name="com.android.keyguard.layout" - android:resource="@layout/keyguard_widget" /> - </activity> <activity android:name="com.android.camera.SecureCameraActivity" android:clearTaskOnLaunch="true" |