summaryrefslogtreecommitdiff
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
Diffstat (limited to 'AndroidManifest.xml')
-rwxr-xr-xAndroidManifest.xml19
1 files changed, 14 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e187f99..8d0c759 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -53,14 +53,11 @@
android:clearTaskOnLaunch="true"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="@string/app_name"
+ android:launchMode="singleTask"
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>
@@ -86,11 +83,23 @@
</intent-filter>
</activity-alias>
+ <activity
+ android:name="com.android.camera.CaptureActivity"
+ android:label="@string/app_name"
+ android:theme="@style/Theme.Camera"
+ android:configChanges="orientation|screenSize|keyboardHidden"
+ android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
+ <intent-filter>
+ <action android:name="android.media.action.IMAGE_CAPTURE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<!-- Video camera and capture use the Camcorder label and icon. -->
<activity-alias
android:name="com.android.camera.VideoCamera"
android:label="@string/video_camera_label"
- android:targetActivity="com.android.camera.CameraActivity">
+ android:targetActivity="com.android.camera.CaptureActivity">
<intent-filter>
<action android:name="android.media.action.VIDEO_CAMERA" />
<category android:name="android.intent.category.DEFAULT" />