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

Commit eed396f7 authored by Marcin Kosiba's avatar Marcin Kosiba
Browse files

Make webview text encoding and keySystemUUID mapping and error page public.

These resources will need to be accessed from the APK-bundled
WebView and therefore need to be made public.

BUG: 11505352
Change-Id: I5e988671cc8342ed4146a90b4de1246460232050
parent c6acfa29
Loading
Loading
Loading
Loading
+53 −0
Original line number Diff line number Diff line
@@ -227,6 +227,34 @@ package android {
    ctor public R.array();
    field public static final int emailAddressTypes = 17235968; // 0x1070000
    field public static final int imProtocols = 17235969; // 0x1070001
    field public static final int l_resource_pad1 = 17236000; // 0x1070020
    field public static final int l_resource_pad10 = 17235991; // 0x1070017
    field public static final int l_resource_pad11 = 17235990; // 0x1070016
    field public static final int l_resource_pad12 = 17235989; // 0x1070015
    field public static final int l_resource_pad13 = 17235988; // 0x1070014
    field public static final int l_resource_pad14 = 17235987; // 0x1070013
    field public static final int l_resource_pad15 = 17235986; // 0x1070012
    field public static final int l_resource_pad16 = 17235985; // 0x1070011
    field public static final int l_resource_pad17 = 17235984; // 0x1070010
    field public static final int l_resource_pad18 = 17235983; // 0x107000f
    field public static final int l_resource_pad19 = 17235982; // 0x107000e
    field public static final int l_resource_pad2 = 17235999; // 0x107001f
    field public static final int l_resource_pad20 = 17235981; // 0x107000d
    field public static final int l_resource_pad21 = 17235980; // 0x107000c
    field public static final int l_resource_pad22 = 17235979; // 0x107000b
    field public static final int l_resource_pad23 = 17235978; // 0x107000a
    field public static final int l_resource_pad24 = 17235977; // 0x1070009
    field public static final int l_resource_pad25 = 17235976; // 0x1070008
    field public static final int l_resource_pad26 = 17235975; // 0x1070007
    field public static final int l_resource_pad27 = 17235974; // 0x1070006
    field public static final int l_resource_pad28 = 17235973; // 0x1070005
    field public static final int l_resource_pad3 = 17235998; // 0x107001e
    field public static final int l_resource_pad4 = 17235997; // 0x107001d
    field public static final int l_resource_pad5 = 17235996; // 0x107001c
    field public static final int l_resource_pad6 = 17235995; // 0x107001b
    field public static final int l_resource_pad7 = 17235994; // 0x107001a
    field public static final int l_resource_pad8 = 17235993; // 0x1070019
    field public static final int l_resource_pad9 = 17235992; // 0x1070018
    field public static final int organizationTypes = 17235970; // 0x1070002
    field public static final int phoneTypes = 17235971; // 0x1070003
    field public static final int postalAddressTypes = 17235972; // 0x1070004
@@ -1832,6 +1860,31 @@ package android {
    field public static final int emptyPhoneNumber = 17039366; // 0x1040006
    field public static final int httpErrorBadUrl = 17039367; // 0x1040007
    field public static final int httpErrorUnsupportedScheme = 17039368; // 0x1040008
    field public static final int l_resource_pad1 = 17039408; // 0x1040030
    field public static final int l_resource_pad10 = 17039399; // 0x1040027
    field public static final int l_resource_pad11 = 17039398; // 0x1040026
    field public static final int l_resource_pad12 = 17039397; // 0x1040025
    field public static final int l_resource_pad13 = 17039396; // 0x1040024
    field public static final int l_resource_pad14 = 17039395; // 0x1040023
    field public static final int l_resource_pad15 = 17039394; // 0x1040022
    field public static final int l_resource_pad16 = 17039393; // 0x1040021
    field public static final int l_resource_pad17 = 17039392; // 0x1040020
    field public static final int l_resource_pad18 = 17039391; // 0x104001f
    field public static final int l_resource_pad19 = 17039390; // 0x104001e
    field public static final int l_resource_pad2 = 17039407; // 0x104002f
    field public static final int l_resource_pad20 = 17039389; // 0x104001d
    field public static final int l_resource_pad21 = 17039388; // 0x104001c
    field public static final int l_resource_pad22 = 17039387; // 0x104001b
    field public static final int l_resource_pad23 = 17039386; // 0x104001a
    field public static final int l_resource_pad24 = 17039385; // 0x1040019
    field public static final int l_resource_pad25 = 17039384; // 0x1040018
    field public static final int l_resource_pad3 = 17039406; // 0x104002e
    field public static final int l_resource_pad4 = 17039405; // 0x104002d
    field public static final int l_resource_pad5 = 17039404; // 0x104002c
    field public static final int l_resource_pad6 = 17039403; // 0x104002b
    field public static final int l_resource_pad7 = 17039402; // 0x104002a
    field public static final int l_resource_pad8 = 17039401; // 0x1040029
    field public static final int l_resource_pad9 = 17039400; // 0x1040028
    field public static final int no = 17039369; // 0x1040009
    field public static final int ok = 17039370; // 0x104000a
    field public static final int paste = 17039371; // 0x104000b
+0 −23
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/assets/res/any/strings.xml
**
** Copyright 2009, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
**     http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- Default text encoding for WebSettings. -->
    <string name="default_text_encoding">Shift_JIS</string>
</resources>
+4 −1
Original line number Diff line number Diff line
@@ -1632,7 +1632,7 @@
    </string-array>

    <!-- This string array can be overriden to add an additional DRM support for WebView EME. -->
    <!-- Array of "[keySystemName],[UuidOfMediaDrm]" -->
    <!-- Array of "[keySystemName],[UuidOfMediaDrm]" @hide @SystemApi -->
    <string-array name="config_keySystemUuidMapping" translatable="false">
        <!-- Example:
        <item>"x-com.microsoft.playready,9A04F079-9840-4286-AB92-E65BE0885F95"</item>
@@ -1654,4 +1654,7 @@

    <string-array translatable="false" name="config_cdma_home_system" />

    <!-- Default text encoding for WebSettings. @hide @SystemApi -->
    <string name="config_webSettingsDefaultTextEncoding">UTF-8</string>

</resources>
+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- Default text encoding for WebSettings. -->
    <string name="default_text_encoding">Latin-1</string>
    <!-- @hide DO NOT TRANSLATE. Workaround for resource race condition in lockscreen. -->
    <bool name="lockscreen_isPortrait">true</bool>
    <!-- @hide DO NOT TRANSLATE. Control aspect ratio of lock pattern -->
+13 −0
Original line number Diff line number Diff line
@@ -2514,6 +2514,14 @@
  <public type="style" name="Widget.Material.Button.Borderless.Colored" />
  <public type="style" name="Widget.Material.Light.Button.Borderless.Colored" />

  <public-padding type="string" name="l_resource_pad" end="0x01040030" />

  <public type="string" name="config_webSettingsDefaultTextEncoding" />

  <public-padding type="array" name="l_resource_pad" end="0x01070020" />

  <public type="array" name="config_keySystemUuidMapping" />

  <public-padding type="interpolator" name="l_resource_pad" end="0x010c0010" />

  <public type="style" name="Theme.Leanback.FormWizard"/>
@@ -2547,4 +2555,9 @@
  <!-- A transition that moves views in or out of the scene to or from the left edge when
       a view visibility changes. -->
  <public type="transition" name="slide_left"/>

  <!-- WebView error page for when the load fails. @hide @SystemApi -->
  <public type="raw" name="loaderror" id="0x01100000"/>
  <!-- WebView error page for when domain lookup fails. @hide @SystemApi -->
  <public type="raw" name="nodomain"/>
</resources>
Loading