diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-12-06 15:28:20 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-12-06 15:28:20 -0800 |
| commit | 36dd26755a2fd13c20bc4267298f603e99c0e867 (patch) | |
| tree | 6db7ff417c6b91bcfcca78742ba25f57fd781b0f | |
| parent | f304deff7729e4199760f74687b96494232232de (diff) | |
| parent | dc2a394c4bea7f4464952177c3a52ed673ac1018 (diff) | |
| download | android_packages_apps_Snap-36dd26755a2fd13c20bc4267298f603e99c0e867.tar.gz android_packages_apps_Snap-36dd26755a2fd13c20bc4267298f603e99c0e867.tar.bz2 android_packages_apps_Snap-36dd26755a2fd13c20bc4267298f603e99c0e867.zip | |
Merge "SnapdragonCamera: Add a option item for record video unlimit"
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 1 | ||||
| -rw-r--r-- | res/values/qcomarrays.xml | 2 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index fc1e3c320..fafdef192 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -398,6 +398,7 @@ <string name="pref_camera_video_duration_entry_mms">"30 秒(MMS)"</string> <string name="pref_camera_video_duration_entry_10">"10 分钟"</string> <string name="pref_camera_video_duration_entry_30">"30 分钟"</string> + <string name="pref_camera_video_duration_entry_nolimit">"无限制"</string> <!-- Settings screen, Select hfr title --> <string name="pref_camera_hfr_title">"视频高帧率"</string> diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index abe13a117..73c34bd39 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -531,6 +531,7 @@ <item>@string/pref_camera_video_duration_entry_mms</item> <item>@string/pref_camera_video_duration_entry_10</item> <item>@string/pref_camera_video_duration_entry_30</item> + <item>@string/pref_camera_video_duration_entry_nolimit</item> </string-array> <!-- The numbers are in minutes, except -1 means the duration suitable for mms. --> @@ -538,6 +539,7 @@ <item>-1</item> <item>10</item> <item>30</item> + <item>0</item> </string-array> <!-- Camera Preferences Skin Tone Enhancement dialog box entries --> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index ba99a0c57..a3cb048ba 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -97,6 +97,7 @@ <string name="pref_camera_video_duration_entry_mms">30 seconds(MMS)</string> <string name="pref_camera_video_duration_entry_10">10 minutes</string> <string name="pref_camera_video_duration_entry_30">30 minutes</string> + <string name="pref_camera_video_duration_entry_nolimit">no limit</string> <!-- Default Skin Tone Enhancement setting. Do not translate. --> <string name="pref_camera_skinToneEnhancement_default">disable</string> |