generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 79285346-> 79320771

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7647 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org
2014-11-06 09:22:08 +00:00
parent 6340acde68
commit 0ef890a4ba
5 changed files with 8 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
talk/examples/android/res/values/arrays.xml
View File

@@ -6,7 +6,6 @@
<item>VGA (640 x 480)</item>
<item>QVGA (320 x 240)</item>
</string-array>
<string-array name="videoResolutionsValues">
<item>Default</item>
<item>1280 x 720</item>
@@ -19,4 +18,5 @@
<item>30 fps</item>
<item>15 fps</item>
</string-array>
</resources>

10
talk/examples/android/res/values/strings.xml
View File

@@ -29,23 +29,19 @@
<string name="pref_url_key">url_preference</string>
<string name="pref_url_title">Connection URL:</string>
<string name="pref_url_summary">AppRTC connection server URL.</string>
<string name="pref_url_dlg">Enter AppRTC connection server URL.</string>
<string name="pref_url_default">https://apprtc.appspot.com</string>
<string name="pref_resolution_key">resolution_preference</string>
<string name="pref_resolution_title">Video resolution.</string>
<string name="pref_resolution_summary">Video resolution.</string>
<string name="pref_resolution_dlg">Enter AppRTC local video resolution.</string>
<string name="pref_resolution_default">Default</string>
<string name="pref_fps_key">fps_preference</string>
<string name="pref_fps_title">Camera fps.</string>
<string name="pref_fps_summary">Camera fps.</string>
<string name="pref_fps_dlg">Enter local camera fps.</string>
<string name="pref_fps_default">Default</string>
<string name="pref_cpu_usage_detection_key">cpu_usage_detection</string>
<string name="pref_cpu_usage_detection_title">CPU overuse detection.</string>
<string name="pref_cpu_usage_detection_dlg">Adapt transmission to CPU status.</string>
<string name="pref_cpu_usage_detection_default">true</string>
<string name="pref_cpu_usage_detection_on">Enabled</string>
<string name="pref_cpu_usage_detection_off">Disabled</string>
</resources>