commit f32062eeef05ad531b02b8fa37c4ae0492b6402c
author Mangesh Ghiware <mghiware@google.com> Wed Sep 25 14:46:30 2013 -0700
committer Mangesh Ghiware <mghiware@google.com> Wed Sep 25 14:46:30 2013 -0700
tree 248a472cf13e90f0027e90608768c3a6f399e17e
parent b998a491a5b24e710bc1711dbb00cbfa05273bf2

Use Camcorder label and icon for video camera activity.

Bug: 10932790
Change-Id: If8847e06049e63116381904382db7dfcebb55010

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1020116..332253f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -54,20 +54,10 @@
             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.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>
             <intent-filter>
@@ -93,6 +83,22 @@
             </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:targetActivity="com.android.camera.CameraActivity">
+            <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>
+        </activity-alias>
+
         <activity
             android:name="com.android.camera.SecureCameraActivity"
             android:clearTaskOnLaunch="true"