diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2012-09-14 00:10:41 -0700 |
|---|---|---|
| committer | Mangesh Ghiware <mghiware@google.com> | 2012-09-14 00:10:41 -0700 |
| commit | a03ff6f3fad765def142825d70722922f34d6a5e (patch) | |
| tree | b2969b48d4a213ee323746ddd17c2f93bc93804e | |
| parent | e7d37f56af35bbbb4a86392328a82cc4680aff47 (diff) | |
| download | android_packages_apps_Camera2-a03ff6f3fad765def142825d70722922f34d6a5e.tar.gz android_packages_apps_Camera2-a03ff6f3fad765def142825d70722922f34d6a5e.tar.bz2 android_packages_apps_Camera2-a03ff6f3fad765def142825d70722922f34d6a5e.zip | |
Update AndroidManifest.xml
Handle launcher, camera, and video camera intents using new
CameraActivity.
Continue to handle image and video capture intents using old Camera and
VideoCamera activities.
Bug: 7167758
Change-Id: Idfddedf04c9664a368f745ebf3f5b44c3d584207
| -rw-r--r-- | AndroidManifest.xml | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f29240a8a..4a727b277 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -271,6 +271,17 @@ <action android:name="android.media.action.IMAGE_CAPTURE" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + </activity> + + <!-- New camera doesn't support the CAPTURE intents yet. --> + <activity android:name="com.android.camera.CameraActivity" + android:taskAffinity="com.google.android.camera" + android:label="@string/camera_label" + android:theme="@style/Theme.Camera" + android:icon="@drawable/ic_switch_camera_holo_light" + android:configChanges="orientation|screenSize|keyboardHidden" + android:clearTaskOnLaunch="true" + android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> <intent-filter> <action android:name="android.media.action.STILL_IMAGE_CAMERA" /> <category android:name="android.intent.category.DEFAULT" /> @@ -279,13 +290,17 @@ <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <intent-filter> + <action android:name="android.media.action.VIDEO_CAMERA" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> </activity> <!-- Icon sourced from www.raadius.deviantart.com/art/Aeolus-HD-200984118 --> <activity-alias android:icon="@mipmap/ic_launcher_camera" android:label="@string/camera_label" android:name="com.android.camera.CameraLauncher" - android:targetActivity="com.android.camera.Camera" > + android:targetActivity="com.android.camera.CameraActivity" > <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> @@ -293,21 +308,6 @@ </intent-filter> </activity-alias> - <activity android:name="com.android.camera.CameraActivity" - android:taskAffinity="com.google.android.camera" - android:label="@string/camera_label" - android:theme="@style/Theme.Camera" - android:icon="@drawable/ic_switch_camera_holo_light" - android:configChanges="orientation|screenSize|keyboardHidden" - android:clearTaskOnLaunch="true" - android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> - <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> - <activity android:name="com.android.camera.VideoCamera" android:taskAffinity="com.android.camera" android:label="@string/video_camera_label" @@ -317,10 +317,6 @@ android:clearTaskOnLaunch="true" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> <intent-filter> - <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_CAPTURE" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> |