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

Commit 5651fc2f authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by Ben Murdoch
Browse files

CHerry pick Find WebView package name from a config resource. DO NOT MERGE 

Use a config resource to determine the package name for the WebView
implementation to allow it to be changed by a resource overlay.

Original Bug: 16329371
Original Change-Id: I5977691c0223347e0382d584c3d3ee4428660180

Bug: 16723226
Change-Id: Ib0b4245f26cbf93f364aa0f30b231786931f9f16
parent 5ced502f

core/java/android/webkit/WebViewFactory.java

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ public final class WebViewFactory { 
    private static boolean sAddressSpaceReserved = false;



    public static String getWebViewPackageName() {

        // TODO: Make this dynamic based on resource configuration.

        return "com.android.webview";

        return AppGlobals.getInitialApplication().getString(

                com.android.internal.R.string.config_webViewPackageName);

    }



    static WebViewFactoryProvider getProvider() {

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -1661,4 +1661,8 @@ 
    <!--Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet

        string that's stored in 8-bit unpacked format) characters.-->

    <bool translatable="false" name="config_sms_decode_gsm_8bit_data">false</bool>



    <!-- Package name providing WebView implementation. -->

    <string name="config_webViewPackageName" translatable="false">com.android.webview</string>



</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1839,6 +1839,7 @@ 
  <java-symbol type="attr" name="actionModeWebSearchDrawable" />

  <java-symbol type="string" name="websearch" />

  <java-symbol type="drawable" name="ic_media_video_poster" />

  <java-symbol type="string" name="config_webViewPackageName" />



  <!-- From SubtitleView -->

  <java-symbol type="dimen" name="subtitle_corner_radius" />