diff options
| author | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-02-23 19:13:56 +0530 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-03-24 15:28:20 -0700 |
| commit | b5626d66ce6a845a61f1b4042f575c118d198344 (patch) | |
| tree | e874e79718f5bafcbb7a915caae1e0fa5989b8ae | |
| parent | 1cba756a374adb20f96c7d8c1c5bfc757c34d6c1 (diff) | |
| download | packages_apps_browser-b5626d66ce6a845a61f1b4042f575c118d198344.zip packages_apps_browser-b5626d66ce6a845a61f1b4042f575c118d198344.tar.gz packages_apps_browser-b5626d66ce6a845a61f1b4042f575c118d198344.tar.bz2 | |
Allow enabling WebSockets from Labs Preferences
Change-Id: Ia0dc06cbd4f2e8e340a8f8ee910a6310a5079d79
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/xml-sw600dp/lab_preferences.xml | 5 | ||||
| -rw-r--r-- | res/xml/lab_preferences.xml | 5 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserSettings.java | 6 | ||||
| -rw-r--r-- | src/com/android/browser/PreferenceKeys.java | 1 |
5 files changed, 21 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index e6b76fe..ee56347 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -657,6 +657,10 @@ <string name="pref_lab_webgl">WebGL</string> <!-- Summary for the WebGL lab feature [CHAR LIMIT=120] --> <string name="pref_lab_webgl_summary">Enable WebGL</string> + <!-- Title for the WebSockets feature [CHAR LIMIT=40] --> + <string name="pref_lab_websockets">WebSockets</string> + <!-- Summary for the WebGL lab feature [CHAR LIMIT=120] --> + <string name="pref_lab_websockets_summary">Enable WebSockets</string> <!-- Title for bandwidth management preference [CHAR LIMIT=25] --> <string name="pref_data_title">Bandwidth management</string> <!-- Title for search preloading [CHAR LIMIT=40] --> diff --git a/res/xml-sw600dp/lab_preferences.xml b/res/xml-sw600dp/lab_preferences.xml index 95cacb0..d700a7a 100644 --- a/res/xml-sw600dp/lab_preferences.xml +++ b/res/xml-sw600dp/lab_preferences.xml @@ -26,4 +26,9 @@ android:defaultValue="true" android:title="@string/pref_lab_webgl" android:summary="@string/pref_lab_webgl_summary" /> + <CheckBoxPreference + android:key="enable_websocket" + android:defaultValue="false" + android:title="@string/pref_lab_websockets" + android:summary="@string/pref_lab_websockets_summary" /> </PreferenceScreen> diff --git a/res/xml/lab_preferences.xml b/res/xml/lab_preferences.xml index 8fca4c7..d603d4b 100644 --- a/res/xml/lab_preferences.xml +++ b/res/xml/lab_preferences.xml @@ -31,4 +31,9 @@ android:defaultValue="true" android:title="@string/pref_lab_webgl" android:summary="@string/pref_lab_webgl_summary" /> + <CheckBoxPreference + android:key="enable_websocket" + android:defaultValue="false" + android:title="@string/pref_lab_websockets" + android:summary="@string/pref_lab_websockets_summary" /> </PreferenceScreen> diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 8ed824e..efab039 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -279,6 +279,7 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, settings.setAutoFillProfile(getAutoFillProfile()); setIsWebGLAvailable(settings.isWebGLAvailable()); settings.setWebGLEnabled(isWebGLAvailable() && isWebGLEnabled()); + settings.setWebSocketsEnabled(isWebSocketsEnabled()); String ua = mCustomUserAgents.get(settings); if (ua != null) { @@ -849,6 +850,11 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, return mPrefs.getBoolean(PREF_ENABLE_WEBGL, true); } + public boolean isWebSocketsEnabled() { + return mPrefs.getBoolean(PREF_ENABLE_WEBSOCKETS, false); + } + + // ----------------------------- // getter/setters for privacy_security_preferences.xml // ----------------------------- diff --git a/src/com/android/browser/PreferenceKeys.java b/src/com/android/browser/PreferenceKeys.java index 2de1073..b0bade2 100644 --- a/src/com/android/browser/PreferenceKeys.java +++ b/src/com/android/browser/PreferenceKeys.java @@ -84,6 +84,7 @@ public interface PreferenceKeys { static final String PREF_ENABLE_QUICK_CONTROLS = "enable_quick_controls"; static final String PREF_FULLSCREEN = "fullscreen"; static final String PREF_ENABLE_WEBGL = "enable_webgl"; + static final String PREF_ENABLE_WEBSOCKETS = "enable_websockets"; // ---------------------- // Keys for privacy_security_preferences.xml |