From da857108f98374a0f00b99c228735d00124843c3 Mon Sep 17 00:00:00 2001
From: Tobias Sargeant <tobiasjs@google.com>
Date: Thu, 11 Feb 2016 14:52:28 +0000
Subject: [PATCH] add developer setting for multiprocess webview

Change-Id: Ia6e7a1219b3324e9c8e8cee43f1c4d8cd217e725
---
 core/java/android/provider/Settings.java    |  6 ++++++
 packages/SettingsLib/res/values/strings.xml | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 5ab2b001614a0..27277a7f45b0b 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6964,6 +6964,12 @@ public final class Settings {
          */
         public static final String WEBVIEW_PROVIDER = "webview_provider";
 
+        /**
+         * Developer setting to enable WebView multiprocess rendering.
+         * @hide
+         */
+        public static final String WEBVIEW_MULTIPROCESS = "webview_multiprocess";
+
        /**
         * Whether Wifi display is enabled/disabled
         * 0=disabled. 1=enabled.
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index 9650651267be8..9a6cf598e5550 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -684,11 +684,16 @@
     <!-- Sound & display settings screen, theme setting value to automatically switch between a light- or dark-colored user interface [CHAR LIMIT=30] -->
     <string name="night_mode_auto">Automatic</string>
 
-    <!-- Developer settings: select WebView provider title -->
+    <!-- Developer settings: enable WebView multiprocess name [CHAR LIMIT=30] -->
+    <string name="enable_webview_multiprocess">Enable multiprocess WebView</string>
+    <!-- Developer settings: enable WebView multiprocess summary [CHAR LIMIT=60] -->
+    <string name="enable_webview_multiprocess_desc">Run WebView renderers in an isolated process.</string>
+
+    <!-- Developer settings: select WebView provider title [CHAR LIMIT=30] -->
     <string name="select_webview_provider_title">WebView implementation</string>
-    <!-- Developer settings: select WebView provider dialog title -->
+    <!-- Developer settings: select WebView provider dialog title [CHAR LIMIT=30] -->
     <string name="select_webview_provider_dialog_title">Set WebView implementation</string>
-    <!-- Developer settings: confirmation dialog text for the WebView provider selection dialog -->
+    <!-- Developer settings: confirmation dialog text for the WebView provider selection dialog [CHAR LIMIT=NONE] -->
     <string name="select_webview_provider_confirmation_text">The chosen WebView implementation is disabled, and must be enabled to be used, do you wish to enable it?</string>
 
     <!-- Developer settings screen, convert userdata to file encryption option name -->