(Auto)update libjingle 79285346-> 79320771
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7647 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/examples/android/res/values/arrays.xml b/examples/android/res/values/arrays.xml
index 30159ba..3127a85 100644
--- a/examples/android/res/values/arrays.xml
+++ b/examples/android/res/values/arrays.xml
@@ -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>
diff --git a/examples/android/res/values/strings.xml b/examples/android/res/values/strings.xml
index 774eee1..2a1d64a 100644
--- a/examples/android/res/values/strings.xml
+++ b/examples/android/res/values/strings.xml
@@ -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>
diff --git a/examples/android/res/xml/preferences.xml b/examples/android/res/xml/preferences.xml
index b8c08bb..f3f91d8 100644
--- a/examples/android/res/xml/preferences.xml
+++ b/examples/android/res/xml/preferences.xml
@@ -3,12 +3,14 @@
<EditTextPreference
android:key="@string/pref_url_key"
android:title="@string/pref_url_title"
+ android:summary="@string/pref_url_summary"
android:defaultValue="@string/pref_url_default"
android:inputType="textWebEmailAddress"
android:dialogTitle="@string/pref_url_dlg" />
<ListPreference
android:key="@string/pref_resolution_key"
android:title="@string/pref_resolution_title"
+ android:summary="@string/pref_resolution_summary"
android:defaultValue="@string/pref_resolution_default"
android:dialogTitle="@string/pref_resolution_dlg"
android:entries="@array/videoResolutions"
@@ -16,14 +18,9 @@
<ListPreference
android:key="@string/pref_fps_key"
android:title="@string/pref_fps_title"
+ android:summary="@string/pref_fps_summary"
android:defaultValue="@string/pref_fps_default"
android:dialogTitle="@string/pref_fps_dlg"
android:entries="@array/cameraFps"
android:entryValues="@array/cameraFps" />
- <CheckBoxPreference
- android:key="@string/pref_cpu_usage_detection_key"
- android:title="@string/pref_cpu_usage_detection_title"
- android:dialogTitle="@string/pref_cpu_usage_detection_dlg"
- android:defaultValue="@string/pref_cpu_usage_detection_default" />
-
-</PreferenceScreen>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/examples/android/src/org/appspot/apprtc/ConnectActivity.java b/examples/android/src/org/appspot/apprtc/ConnectActivity.java
index ce99bbf..8f00c1c 100644
--- a/examples/android/src/org/appspot/apprtc/ConnectActivity.java
+++ b/examples/android/src/org/appspot/apprtc/ConnectActivity.java
@@ -73,7 +73,6 @@
private String keyprefUrl;
private String keyprefResolution;
private String keyprefFps;
- private String keyprefCpuUsageDetection;
private String keyprefRoom;
private String keyprefRoomList;
private ArrayList<String> roomList;
@@ -89,7 +88,6 @@
keyprefUrl = getString(R.string.pref_url_key);
keyprefResolution = getString(R.string.pref_resolution_key);
keyprefFps = getString(R.string.pref_fps_key);
- keyprefCpuUsageDetection = getString(R.string.pref_cpu_usage_detection_key);
keyprefRoom = getString(R.string.pref_room_key);
keyprefRoomList = getString(R.string.pref_room_list_key);
@@ -254,14 +252,6 @@
url += "&hd=true";
}
}
- // Test if CpuOveruseDetection should be disabled. By default is on.
- boolean cpuOveruseDetection = sharedPref.getBoolean(
- keyprefCpuUsageDetection,
- Boolean.valueOf(
- getString(R.string.pref_cpu_usage_detection_default)));
- if (!cpuOveruseDetection) {
- url += "&googCpuOveruseDetection=false";
- }
// TODO(kjellander): Add support for custom parameters to the URL.
connectToRoom(url);
}
diff --git a/examples/android/src/org/appspot/apprtc/SettingsActivity.java b/examples/android/src/org/appspot/apprtc/SettingsActivity.java
index eccb67e..2354ceb 100644
--- a/examples/android/src/org/appspot/apprtc/SettingsActivity.java
+++ b/examples/android/src/org/appspot/apprtc/SettingsActivity.java
@@ -39,7 +39,6 @@
private String keyprefUrl;
private String keyprefResolution;
private String keyprefFps;
- private String keyprefCpuUsageDetection;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -47,7 +46,6 @@
keyprefUrl = getString(R.string.pref_url_key);
keyprefResolution = getString(R.string.pref_resolution_key);
keyprefFps = getString(R.string.pref_fps_key);
- keyprefCpuUsageDetection = getString(R.string.pref_cpu_usage_detection_key);
// Display the fragment as the main content.
settingsFragment = new SettingsFragment();
@@ -66,7 +64,6 @@
updateSummary(sharedPreferences, keyprefUrl);
updateSummary(sharedPreferences, keyprefResolution);
updateSummary(sharedPreferences, keyprefFps);
- updateSummaryB(sharedPreferences, keyprefCpuUsageDetection);
}
@Override
@@ -83,8 +80,6 @@
if (key.equals(keyprefUrl) || key.equals(keyprefResolution) ||
key.equals(keyprefFps)) {
updateSummary(sharedPreferences, key);
- } else if (key.equals(keyprefCpuUsageDetection)) {
- updateSummaryB(sharedPreferences, key);
}
}
@@ -94,11 +89,4 @@
updatedPref.setSummary(sharedPreferences.getString(key, ""));
}
- private void updateSummaryB(SharedPreferences sharedPreferences, String key) {
- Preference updatedPref = settingsFragment.findPreference(key);
- updatedPref.setSummary(sharedPreferences.getBoolean(key, true)
- ? getString(R.string.pref_cpu_usage_detection_on)
- : getString(R.string.pref_cpu_usage_detection_off));
- }
-
}
