Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7000fa8 authored by Toby Sargeant's avatar Toby Sargeant Committed by Android (Google) Code Review
Browse files

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

parents acaf8091 da857108

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -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.

packages/SettingsLib/res/values/strings.xml

+8 −3
Original line number Diff line number Diff line
@@ -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 -->