summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2013-09-26 17:14:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-26 17:14:56 +0000
commit22236064c8ec28196c07e847d4acb06e214deda8 (patch)
treebbc40da81df05eebd7908ee9787e9fc6ac6db3e1 /res
parent192686cfde67ae1cc9933b865e8c196b363b54f7 (diff)
parentf32062eeef05ad531b02b8fa37c4ae0492b6402c (diff)
downloadandroid_packages_apps_Snap-22236064c8ec28196c07e847d4acb06e214deda8.tar.gz
android_packages_apps_Snap-22236064c8ec28196c07e847d4acb06e214deda8.tar.bz2
android_packages_apps_Snap-22236064c8ec28196c07e847d4acb06e214deda8.zip
Merge "Use Camcorder label and icon for video camera activity." into gb-ub-photos-carlsbad
Diffstat (limited to 'res')
-rw-r--r--res/mipmap-hdpi/ic_launcher_video_camera.pngbin0 -> 7051 bytes
-rw-r--r--res/mipmap-mdpi/ic_launcher_video_camera.pngbin0 -> 3482 bytes
-rw-r--r--res/values/strings.xml2
3 files changed, 2 insertions, 0 deletions
diff --git a/res/mipmap-hdpi/ic_launcher_video_camera.png b/res/mipmap-hdpi/ic_launcher_video_camera.png
new file mode 100644
index 000000000..d24265729
--- /dev/null
+++ b/res/mipmap-hdpi/ic_launcher_video_camera.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_video_camera.png b/res/mipmap-mdpi/ic_launcher_video_camera.png
new file mode 100644
index 000000000..19f0e64e2
--- /dev/null
+++ b/res/mipmap-mdpi/ic_launcher_video_camera.png
Binary files differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9639f604b..2d8684850 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,6 +17,8 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
<string name="app_name">Camera</string>
+ <!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
+ <string name="video_camera_label">Camcorder</string>
<!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
<string name="details_ms">%1$02d:%2$02d</string>
<!-- Used to format video duration in Details dialog. hours:minutes:seconds e.g. 0:21:30 -->