diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-11-13 10:39:26 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-11-14 11:34:05 -0800 |
| commit | f00d4d052fd196ab4d736e3f9e9f3605a99f0094 (patch) | |
| tree | 0d7ccd416ad4ab352b95be1edff5333222fd6183 | |
| parent | af1c7ae7ebe09c59c151d7efb6719e31cc13253b (diff) | |
| download | android_packages_apps_Snap-f00d4d052fd196ab4d736e3f9e9f3605a99f0094.tar.gz android_packages_apps_Snap-f00d4d052fd196ab4d736e3f9e9f3605a99f0094.tar.bz2 android_packages_apps_Snap-f00d4d052fd196ab4d736e3f9e9f3605a99f0094.zip | |
Video: Add the mute functionality.
1. Enable the mute video functionality.
2. Consolidate the sharing code, especially for file handling.
bug:7543943
Change-Id: Ie7ec605996bc3242b1a50385f506e6a50ee2d2fc
| -rw-r--r-- | res/menu/photo.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 17 |
2 files changed, 16 insertions, 4 deletions
diff --git a/res/menu/photo.xml b/res/menu/photo.xml index df3e4e81c..16b242905 100644 --- a/res/menu/photo.xml +++ b/res/menu/photo.xml @@ -59,6 +59,9 @@ <item android:id="@+id/action_trim" android:title="@string/trim_action" android:showAsAction="never" /> + <item android:id="@+id/action_mute" + android:title="@string/mute_action" + android:showAsAction="never" /> <item android:id="@+id/action_setas" android:title="@string/set_image" android:showAsAction="never" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index d62bfdc55..ff4fe891d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -183,11 +183,18 @@ offline. [CHAR LIMIT=15] --> <string name="caching_label">Caching\u2026</string> + <!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] --> <string name="crop_action">Crop</string> + <!-- The title of the menu item to let user trim the video. [CHAR LIMIT=15] --> <string name="trim_action">Trim</string> + <!-- The title of the menu item to let user mute the video. [CHAR LIMIT=15] --> + <string name="mute_action">Mute</string> + <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] --> <string name="set_as">Set as</string> - <!-- String indicating an approximate location eg. Around Palo Alto, CA --> + <!-- String indicating an error when muting the video. [CHAR LIMIT=30] --> + <string name="video_mute_err">Can\'t mute video.</string> + <!-- String indicating an error when playing the video. [CHAR LIMIT=30] --> <string name="video_err">Can\'t play video.</string> <!-- Strings for grouping operations in the menu. The photos can be grouped @@ -494,12 +501,14 @@ <!-- The tilte of a dialog showing trimming in progress. [CHAR LIMIT=20] --> <string name="trimming">Trimming</string> + <!-- The tilte of a dialog showing muting in progress. [CHAR LIMIT=20] --> + <string name="muting">Muting</string> + <!-- The content of a dialog showing trimming in progress. [CHAR LIMIT=30] --> <string name="please_wait">Please wait</string> - <!-- Toast after the trimming is done. [CHAR LIMIT=50] --> - <!-- TODO: this should be a format string!--> - <string name="save_into">Saving trimmed video into album :</string> + <!-- Toast after the trimming / muting is done. [CHAR LIMIT=50] --> + <string name="save_into">Saving video to <xliff:g id="album_name">%1$s</xliff:g> \u2026</string> <!-- Toast if the trimmed video is too short to trim. [CHAR LIMIT=80] --> <string name="trim_too_short">Can not trim : target video is too short</string> |