Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "add developer setting for multiprocess webview" into nyc-dev

Browse Source
This commit is contained in:
Toby Sargeant
2016-02-19 09:14:55 +00:00
committed by Android (Google) Code Review
parent acaf80910d da857108f9
commit a7000fa864
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/provider/Settings.java
View File

@@ -6978,6 +6978,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.

11
packages/SettingsLib/res/values/strings.xml
View File

@@ -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 -->