summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-es/strings.xml4
-rw-r--r--res/values-hu/strings.xml22
-rw-r--r--res/values-it/cm_strings.xml26
-rw-r--r--res/values-it/strings.xml11
-rw-r--r--res/values-pl/strings.xml3
-rw-r--r--[-rwxr-xr-x]res/values-pt/strings.xml6
-rw-r--r--res/values-zh-rCN/strings.xml25
-rw-r--r--res/values/strings.xml6
-rw-r--r--res/xml-sw600dp/lab_preferences.xml5
-rw-r--r--res/xml/lab_preferences.xml5
-rw-r--r--src/com/android/browser/BrowserSettings.java6
-rw-r--r--src/com/android/browser/PreferenceKeys.java1
12 files changed, 97 insertions, 23 deletions
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 33b915a..5eec925 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -405,6 +405,10 @@
<string name="contextmenu_openlink_incognito_newwindow_background">Abrir en pestaña de incógnito en segundo plano</string>
<string name="pref_content_ua">Agente de usuario</string>
<string name="pref_content_ua_summary">Elige un agente de usuario</string>
+ <string name="pref_lab_webgl">WebGL</string>
+ <string name="pref_lab_webgl_summary">Habilitar WebGL</string>
+ <string name="pref_lab_websockets">WebSockets</string>
+ <string name="pref_lab_websockets_summary">Habilitar WebSockets</string>
<string name="accessibility_button_homescreen">Pantalla de inicio</string>
<!-- CYANOGENMOD ADDITIONS END -->
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index fb85b05..de7ab26 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -110,8 +110,6 @@
<string name="contextmenu_openlink" msgid="7237961252214188935">"Megnyitás"</string>
<string name="contextmenu_openlink_newwindow" msgid="1205313604181761403">"Megnyitás új lapon"</string>
<string name="contextmenu_openlink_newwindow_background" msgid="4690381019116746687">"Megnyitás új lapon a háttérben"</string>
- <string name="contextmenu_openlink_incognito_newwindow">Megnyitás új lapfülön, inkognitó módban</string>
- <string name="contextmenu_openlink_incognito_newwindow_background">Megnyitás új lapfülön, inkognitó módban (háttérben)</string>
<string name="contextmenu_savelink" msgid="5508554930832538184">"Link mentése"</string>
<string name="contextmenu_sharelink" msgid="5392275392280130331">"Link megosztása"</string>
<string name="contextmenu_copy" msgid="398860586635404030">"Másolás"</string>
@@ -145,8 +143,6 @@
<string name="pref_content_homepage" msgid="3324574611613105696">"Kezdőlap beállítása"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Keresőmotor beállítása"</string>
<string name="pref_content_search_engine_summary" msgid="304003941861818133">"Válasszon egy keresőmotort"</string>
- <string name="pref_content_ua">Böngészőazonosító</string>
- <string name="pref_content_ua_summary">Válasszon böngészőazonosítót</string>
<string name="pref_set_homepage_to" msgid="7838684355145561242">"Beállítás"</string>
<string-array name="pref_homepage_choices">
<item msgid="844041670142910837">"Jelenlegi oldal"</item>
@@ -279,8 +275,6 @@
<string name="pref_use_instant_search_summary" msgid="839320474961917522">"A Google-keresésnél használja a Google Instantot, és a találatok gépelés közben megjelennek (az adatforgalom nőhet)."</string>
<string name="pref_lab_fullscreen" msgid="8173609016657987973">"Teljes képernyő"</string>
<string name="pref_lab_fullscreen_summary" msgid="7694738112219376740">"Használja a teljes képernyős módot az állapotsor elrejtéséhez."</string>
- <string name="pref_lab_webgl">WebGL</string>
- <string name="pref_lab_webgl_summary">WebGL engedélyezése</string>
<string name="pref_data_title" msgid="7255058703417796578">"Sávszélesség kezelése"</string>
<string name="pref_data_preload_title" msgid="4479320472980292873">"Keresési találatok előtöltése"</string>
<string-array name="pref_data_preload_choices">
@@ -398,11 +392,25 @@
<string name="accessibility_button_clear" msgid="6943152307986161598">"Beírt szöveg törlése"</string>
<string name="accessibility_button_uaswitch" msgid="6286804719724282339">"Felhasználói ügynök váltása"</string>
<string name="accessibility_button_go" msgid="1182818872083055958">"Mehet"</string>
- <string name="accessibility_button_homescreen">Kezdőlap</string>
<string name="accessibility_button_navscreen" msgid="9142904748728713075">"Oldalkezelő"</string>
<string name="accessibility_button_more" msgid="3054251446394224216">"További beállítások"</string>
<string name="accessibility_state_incognito" msgid="5786038488425202355">"Inkognitóoldal"</string>
<string name="accessibility_state_frozen" msgid="8041539250447035570">"Mentett oldal"</string>
<string name="accessibility_transition_navscreen" msgid="2734915619351519547">"Lapkezelés"</string>
<string name="accessibility_button_bookmarks_folder_up" msgid="9179389954714270505">"Előző mappa"</string>
+
+ <!-- CYANOGENMOD ADDITIONS START -->
+
+ <string name="contextmenu_openlink_incognito_newwindow">Megnyitás új lapfülön, inkognitó módban</string>
+ <string name="contextmenu_openlink_incognito_newwindow_background">Megnyitás új lapfülön, inkognitó módban (háttérben)</string>
+ <string name="pref_content_ua">Böngészőazonosító</string>
+ <string name="pref_content_ua_summary">Válasszon böngészőazonosítót</string>
+ <string name="accessibility_button_homescreen">Kezdőlap</string>
+ <string name="pref_lab_webgl">WebGL</string>
+ <string name="pref_lab_webgl_summary">WebGL engedélyezése</string>
+ <string name="pref_lab_websockets">WebSocketek</string>
+ <string name="pref_lab_websockets_summary">WebSocketek engedélyezése</string>
+
+ <!-- CYANOGENMOD ADDITIONS END -->
+
</resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
new file mode 100644
index 0000000..4d7a16d
--- /dev/null
+++ b/res/values-it/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="contextmenu_openlink_incognito_newwindow">Apri in una nuova scheda in incognito</string>
+ <string name="contextmenu_openlink_incognito_newwindow_background">Apri in una nuova scheda in secondo piano in incognito</string>
+ <string name="pref_content_ua">User agent</string>
+ <string name="pref_content_ua_summary">Scegli lo user agent</string>
+ <string name="pref_lab_webgl">WebGL</string>
+ <string name="pref_lab_webgl_summary">Attiva WebGL</string>
+ <string name="accessibility_button_homescreen">Pagina iniziale</string>
+ <string name="pref_lab_websockets">WebSocket</string>
+ <string name="pref_lab_websockets_summary">Attiva WebSocket</string>
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b33f3bd..6a96a52 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -110,8 +110,6 @@
<string name="contextmenu_openlink" msgid="7237961252214188935">"Apri"</string>
<string name="contextmenu_openlink_newwindow" msgid="1205313604181761403">"Apri in nuova scheda"</string>
<string name="contextmenu_openlink_newwindow_background" msgid="4690381019116746687">"Apri in una nuova scheda in secondo piano"</string>
- <string name="contextmenu_openlink_incognito_newwindow">"Apri in una nuova scheda in incognito"</string>
- <string name="contextmenu_openlink_incognito_newwindow_background">"Apri in una nuova scheda in secondo piano in incognito"</string>
<string name="contextmenu_savelink" msgid="5508554930832538184">"Salva link"</string>
<string name="contextmenu_sharelink" msgid="5392275392280130331">"Condividi link"</string>
<string name="contextmenu_copy" msgid="398860586635404030">"Copia"</string>
@@ -145,8 +143,6 @@
<string name="pref_content_homepage" msgid="3324574611613105696">"Imposta pagina iniziale"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Imposta motore di ricerca"</string>
<string name="pref_content_search_engine_summary" msgid="304003941861818133">"Scegli un motore di ricerca"</string>
- <string name="pref_content_ua">User agent</string>
- <string name="pref_content_ua_summary">Scegli lo user agent</string>
<string name="pref_set_homepage_to" msgid="7838684355145561242">"Imposta su"</string>
<string-array name="pref_homepage_choices">
<item msgid="844041670142910837">"Pagina corrente"</item>
@@ -279,8 +275,6 @@
<string name="pref_use_instant_search_summary" msgid="839320474961917522">"Usa Google Instant con Ricerca Google per visualizzare i risultati mentre digiti (può aumentare l\'uso dei dati)."</string>
<string name="pref_lab_fullscreen" msgid="8173609016657987973">"Schermo intero"</string>
<string name="pref_lab_fullscreen_summary" msgid="7694738112219376740">"Usa la modalità a schermo intero per nascondere la barra di stato."</string>
- <string name="pref_lab_webgl">WebGL</string>
- <string name="pref_lab_webgl_summary">Abilita WebGL</string>
<string name="pref_data_title" msgid="7255058703417796578">"Gestione larghezza di banda"</string>
<string name="pref_data_preload_title" msgid="4479320472980292873">"Precaricamento risultati di ricerca"</string>
<string-array name="pref_data_preload_choices">
@@ -398,7 +392,6 @@
<string name="accessibility_button_clear" msgid="6943152307986161598">"Cancella testo inserito"</string>
<string name="accessibility_button_uaswitch" msgid="6286804719724282339">"Cambia user agent"</string>
<string name="accessibility_button_go" msgid="1182818872083055958">"Vai"</string>
- <string name="accessibility_button_homescreen">Pagina iniziale</string>
<string name="accessibility_button_navscreen" msgid="9142904748728713075">"Gestione pagine"</string>
<string name="accessibility_button_more" msgid="3054251446394224216">"Altre opzioni"</string>
<string name="accessibility_state_incognito" msgid="5786038488425202355">"Pagina in incognito"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1366919..7e7d05f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -417,4 +417,7 @@
<!-- Content description for home screen button [CHAR LIMIT=NONE] -->
<string name="accessibility_button_homescreen">Ekran główny</string>
+
+ <string name="pref_lab_websockets">WebSocket</string>
+ <string name="pref_lab_websockets_summary">Aktywuj WebSocket</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b0610f0..29d9796 100755..100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -403,4 +403,8 @@
<string name="accessibility_button_homescreen">Tela Inicial</string>
<string name="pref_content_ua">Agente de usuário</string>
<string name="pref_content_ua_summary">Escolha um agente de usuário</string>
-</resources>
+ <string name="pref_lab_webgl">WebGL</string>
+ <string name="pref_lab_webgl_summary">Ativar WebGL</string>
+ <string name="pref_lab_websockets">WebSockets</string>
+ <string name="pref_lab_websockets_summary">Ativar WebSockets</string>
+</resources> \ No newline at end of file
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index bbc409f..cdc93c0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -144,10 +144,6 @@
<string name="pref_content_homepage" msgid="3324574611613105696">"设置主页"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"设置搜索引擎"</string>
<string name="pref_content_search_engine_summary" msgid="304003941861818133">"选择搜索引擎"</string>
- <!-- User agent label -->
- <string name="pref_content_ua">用户代理</string>
- <!-- User agent summary -->
- <string name="pref_content_ua_summary">选择一个用户代理</string>
<string name="pref_set_homepage_to" msgid="7838684355145561242">"设置为"</string>
<string-array name="pref_homepage_choices">
<item msgid="844041670142910837">"当前页"</item>
@@ -397,11 +393,30 @@
<string name="accessibility_button_clear" msgid="6943152307986161598">"清除输入内容"</string>
<string name="accessibility_button_uaswitch" msgid="6286804719724282339">"切换用户代理"</string>
<string name="accessibility_button_go" msgid="1182818872083055958">"转到"</string>
- <string name="accessibility_button_homescreen">主屏幕</string>
+
<string name="accessibility_button_navscreen" msgid="9142904748728713075">"网页管理器"</string>
<string name="accessibility_button_more" msgid="3054251446394224216">"更多选项"</string>
<string name="accessibility_state_incognito" msgid="5786038488425202355">"隐身网页"</string>
<string name="accessibility_state_frozen" msgid="8041539250447035570">"已保存的网页"</string>
<string name="accessibility_transition_navscreen" msgid="2734915619351519547">"标签页管理"</string>
<string name="accessibility_button_bookmarks_folder_up" msgid="9179389954714270505">"上一个文件夹"</string>
+
+ <!-- CYANOGENMOD ADDITIONS START -->
+
+ <!-- User agent label -->
+ <string name="pref_content_ua">用户代理</string>
+ <!-- User agent summary -->
+ <string name="pref_content_ua_summary">选择一个用户代理</string>
+
+ <!-- Title for the WebGL feature [CHAR LIMIT=40] -->
+ <string name="pref_lab_webgl">WebGL</string>
+ <!-- Summary for the WebGL lab feature [CHAR LIMIT=120] -->
+ <string name="pref_lab_webgl_summary">启用 WebGL</string>
+
+ <!-- Context Menu item to open the currently selected link in a new
+ background window. [CHAR LIMIT=50] -->
+ <string name="contextmenu_openlink_incognito_newwindow_background">在后台新隐身标签页中打开</string>
+
+ <!-- Content description for home screen button [CHAR LIMIT=NONE] -->
+ <string name="accessibility_button_homescreen">主屏幕</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1492e77..ee56347 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -328,7 +328,7 @@
<!-- User agent label -->
<string name="pref_content_ua">User agent</string>
<!-- User agent summary -->
- <string name="pref_content_ua_summary">Choose an user agent</string>
+ <string name="pref_content_ua_summary">Choose a user agent</string>
<!-- User agent choices -->
<string-array name="pref_content_ua_choices" translatable="false">
<item>Android</item>
@@ -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
generated by cgit v1.1 at 2024-05-20 22:26:56 +0000