diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2013-09-26 10:17:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-26 10:17:01 -0700 |
| commit | 61ea6472afe534df003673d1b76e3a078c340218 (patch) | |
| tree | 68b0262639b68f81e01263b3d8d2a7a022ffad52 /res | |
| parent | d859daee43f514a07032b64af7edf1e9f23ce3ad (diff) | |
| parent | 22236064c8ec28196c07e847d4acb06e214deda8 (diff) | |
| download | android_packages_apps_Snap-61ea6472afe534df003673d1b76e3a078c340218.tar.gz android_packages_apps_Snap-61ea6472afe534df003673d1b76e3a078c340218.tar.bz2 android_packages_apps_Snap-61ea6472afe534df003673d1b76e3a078c340218.zip | |
am 22236064: Merge "Use Camcorder label and icon for video camera activity." into gb-ub-photos-carlsbad
* commit '22236064c8ec28196c07e847d4acb06e214deda8':
Use Camcorder label and icon for video camera activity.
Diffstat (limited to 'res')
| -rw-r--r-- | res/mipmap-hdpi/ic_launcher_video_camera.png | bin | 0 -> 7051 bytes | |||
| -rw-r--r-- | res/mipmap-mdpi/ic_launcher_video_camera.png | bin | 0 -> 3482 bytes | |||
| -rw-r--r-- | res/values/strings.xml | 2 |
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 Binary files differnew file mode 100644 index 000000000..d24265729 --- /dev/null +++ b/res/mipmap-hdpi/ic_launcher_video_camera.png diff --git a/res/mipmap-mdpi/ic_launcher_video_camera.png b/res/mipmap-mdpi/ic_launcher_video_camera.png Binary files differnew file mode 100644 index 000000000..19f0e64e2 --- /dev/null +++ b/res/mipmap-mdpi/ic_launcher_video_camera.png 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 --> |
