summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-08-13 20:30:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-13 20:30:14 +0000
commit6d8bb2792391182cf75783acaff5acb1c38d9be4 (patch)
tree88ba27806522e5a716dcbe681455e55df9b06cb8 /res
parent57549631449fab8cd4d8dffe730bee4d5c4d8890 (diff)
parentcf44e5869bb034b1d4c23566e0b3efd3933f67c4 (diff)
downloadandroid_packages_apps_Snap-6d8bb2792391182cf75783acaff5acb1c38d9be4.tar.gz
android_packages_apps_Snap-6d8bb2792391182cf75783acaff5acb1c38d9be4.tar.bz2
android_packages_apps_Snap-6d8bb2792391182cf75783acaff5acb1c38d9be4.zip
Merge "Remove old video camera icon and label from Camera2" into gb-ub-photos-carlsbad
Diffstat (limited to 'res')
-rw-r--r--res/mipmap-hdpi/ic_launcher_video_camera.pngbin7051 -> 0 bytes
-rw-r--r--res/mipmap-mdpi/ic_launcher_video_camera.pngbin3482 -> 0 bytes
-rw-r--r--res/values/strings.xml3
3 files changed, 0 insertions, 3 deletions
diff --git a/res/mipmap-hdpi/ic_launcher_video_camera.png b/res/mipmap-hdpi/ic_launcher_video_camera.png
deleted file mode 100644
index d24265729..000000000
--- a/res/mipmap-hdpi/ic_launcher_video_camera.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_video_camera.png b/res/mipmap-mdpi/ic_launcher_video_camera.png
deleted file mode 100644
index 19f0e64e2..000000000
--- a/res/mipmap-mdpi/ic_launcher_video_camera.png
+++ /dev/null
Binary files differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5336744eb..aa4e4060d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -567,9 +567,6 @@
<!-- 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>
-
<!-- alert to the user to wait for some operation to complete -->
<string name="wait">Please wait\u2026</string>