AI 143167: am: CL 142866 Add an icon for video camera. Issue 1722666.
Original author: owenlin
Merged from: //branches/cupcake/...
Automated import of CL 143167
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ea8f12e..8c79f8c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -38,11 +38,18 @@
</intent-filter>
</activity>
<activity android:name="VideoCamera"
+ android:label="@string/video_camera_label"
android:configChanges="orientation|keyboardHidden"
+ android:icon="@drawable/ic_launcher_video_camera"
android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
android:screenOrientation="landscape"
android:clearTaskOnLaunch="true"
- android:taskAffinity="android.task.camera">
+ android:taskAffinity="android.task.videocamera">
+ <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>
<intent-filter>
<action android:name="android.media.action.VIDEO_CAMERA" />
<category android:name="android.intent.category.DEFAULT" />
@@ -63,7 +70,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
-
<activity android:name="ImageGallery2" android:label="@string/gallery_label"
android:configChanges="orientation|keyboardHidden"
android:icon="@drawable/ic_launcher_gallery">
diff --git a/res/drawable/ic_launcher_video_camera.png b/res/drawable/ic_launcher_video_camera.png
new file mode 100755
index 0000000..e80255a
--- /dev/null
+++ b/res/drawable/ic_launcher_video_camera.png
Binary files differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cea087d..7408f57 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -26,6 +26,9 @@
<!-- label for the icon meaning 'show me all the images that were taken with the camera' -->
<string name="camera_label">Camera</string>
+ <!-- label for the 'video recording application shown in the top level 'all applications' -->
+ <string name="video_camera_label">Camcorder</string>
+
<!-- label for the 'pictures application shown in the top level 'all applications' -->
<string name="gallery_picker_label">Gallery</string>
