summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2013-04-05 17:41:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-05 17:41:34 +0000
commita95604de1acd89999c240449e926485393963455 (patch)
tree42c6a3cbf0ee02432ea42cf60411c687279fa330 /res
parente68959de3a7f2d47de4816b65262b10e03ef313c (diff)
parent8dc6d08f3b654805e717f8a05b3f589fd9fc136e (diff)
downloadpackages_apps_Settings-a95604de1acd89999c240449e926485393963455.zip
packages_apps_Settings-a95604de1acd89999c240449e926485393963455.tar.gz
packages_apps_Settings-a95604de1acd89999c240449e926485393963455.tar.bz2
Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml5
-rw-r--r--res/xml/development_prefs.xml5
2 files changed, 10 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 573f4a0..fbf051e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4002,6 +4002,11 @@
<string name="show_all_anrs_summary">Show App Not Responding dialog
for background apps</string>
+ <!-- UI debug setting: use experimental WebView [CHAR LIMIT=25] -->
+ <string name="experimental_webview">Use Experimental WebView</string>
+ <!-- UI debug setting: use experimental WebView summary [CHAR LIMIT=50] -->
+ <string name="experimental_webview_summary">Apps will use the newest (beta) WebView</string>
+
<!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
<string name="data_usage_summary_title">Data usage</string>
<!-- Title for option to pick visible time range from a list available usage periods. [CHAR LIMIT=25] -->
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 6fbbbf4..72b73bb 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -234,6 +234,11 @@
android:title="@string/show_all_anrs"
android:summary="@string/show_all_anrs_summary"/>
+ <CheckBoxPreference
+ android:key="experimental_webview"
+ android:title="@string/experimental_webview"
+ android:summary="@string/experimental_webview_summary"/>
+
</PreferenceCategory>
</PreferenceScreen>