summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml17
1 files changed, 14 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b2c6c72ff..f9035fa5d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -291,15 +291,26 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
- <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" />
+ <action android:name="android.media.action.VIDEO_CAMERA" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
- <action android:name="android.media.action.VIDEO_CAMERA" />
+ <action android:name="android.media.action.VIDEO_CAPTURE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ </activity>
+
+ <activity android:name="com.android.camera.SecureCameraActivity"
+ android:taskAffinity="com.android.camera.SecureCameraActivity"
+ android:excludeFromRecents="true"
+ android:label="@string/camera_label"
+ android:theme="@style/Theme.Camera"
+ android:icon="@mipmap/ic_launcher_camera"
+ android:configChanges="orientation|screenSize|keyboardHidden"
+ android:clearTaskOnLaunch="true"
+ android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
<intent-filter>
- <action android:name="android.media.action.VIDEO_CAPTURE" />
+ <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>