diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-18 15:01:39 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-18 15:01:39 -0700 |
| commit | 6bd73c5658538182923109b1423481720b269402 (patch) | |
| tree | b0fe6dd4a41a8c2fb38651c468657b235f6d796d /AndroidManifest.xml | |
| parent | c221aa033f25b5c020e77440c384cd6a78763566 (diff) | |
| parent | 9a4e6d0253792dea4e52cd180f3fd74cc9d65ab3 (diff) | |
| download | android_packages_apps_Snap-6bd73c5658538182923109b1423481720b269402.tar.gz android_packages_apps_Snap-6bd73c5658538182923109b1423481720b269402.tar.bz2 android_packages_apps_Snap-6bd73c5658538182923109b1423481720b269402.zip | |
Merge "SnapdragonCamera: fix invoke camera failture caused by permissions" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'AndroidManifest.xml')
| -rwxr-xr-x | AndroidManifest.xml | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e316ee6ed..6ec0df351 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -54,18 +54,6 @@ android:taskAffinity="com.android.camera.CameraActivity" android:theme="@style/Theme.Camera" android:windowSoftInputMode="stateAlwaysHidden|adjustPan" > - <intent-filter> - <action android:name="android.media.action.IMAGE_CAPTURE" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - <intent-filter> - <action android:name="android.media.action.STILL_IMAGE_CAMERA" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> <meta-data android:name="com.android.keyguard.layout" @@ -95,13 +83,33 @@ </intent-filter> </activity-alias> + <activity-alias + android:name="com.android.camera.PhotoCamera" + android:icon="@mipmap/ic_launcher_camera" + android:label="@string/snapcam_app_name" + android:launchMode="singleTop" + android:targetActivity="com.android.camera.PermissionsActivity"> + <intent-filter> + <action android:name="android.media.action.IMAGE_CAPTURE" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <intent-filter> + <action android:name="android.media.action.STILL_IMAGE_CAMERA" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <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" android:icon="@mipmap/ic_launcher_video_camera" android:label="@string/video_camera_label" android:launchMode="singleTop" - android:targetActivity="com.android.camera.CameraActivity"> + android:targetActivity="com.android.camera.PermissionsActivity"> <intent-filter> <action android:name="android.media.action.VIDEO_CAMERA" /> <category android:name="android.intent.category.DEFAULT" /> |