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

am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev

Browse Source 
* commit '4f3ee426f62662f590c056ce44f005cd716f9870':
  Remove the default WebView text encoding resource entirely.
This commit is contained in:
Marcin Kosiba
2014-10-13 09:47:01 +00:00
committed by Android Git Automerger
parent 843fe45127 4f3ee426f6
commit 58ee8a966a
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/webkit/WebSettings.java
View File

@@ -1355,9 +1355,10 @@ public abstract class WebSettings {
public synchronized boolean getJavaScriptCanOpenWindowsAutomatically() { public synchronized boolean getJavaScriptCanOpenWindowsAutomatically() {
throw new MustOverrideException(); throw new MustOverrideException();
} }
/** /**
* Sets the default text encoding name to use when decoding html pages. * Sets the default text encoding name to use when decoding html pages.
* The default is "Latin-1". * The default is "UTF-8".
* *
* @param encoding the text encoding name * @param encoding the text encoding name
*/ */

3
core/res/res/values/config.xml
View File

@@ -1779,9 +1779,6 @@
<string-array translatable="false" name="config_cdma_home_system" /> <string-array translatable="false" name="config_cdma_home_system" />
<!-- Default text encoding for WebSettings. @hide @SystemApi -->
<string name="config_webSettingsDefaultTextEncoding">UTF-8</string>
<!--From SmsMessage--> <!--From SmsMessage-->
<!--Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet <!--Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet
string that's stored in 8-bit unpacked format) characters.--> string that's stored in 8-bit unpacked format) characters.-->

2
core/res/res/values/public.xml
View File

@@ -2545,8 +2545,6 @@
<!-- @hide This really shouldn't be public; clients using it should use @* to ref it. --> <!-- @hide This really shouldn't be public; clients using it should use @* to ref it. -->
<public type="style" name="Theme.Leanback.FormWizard" id="0x010302d0" /> <public type="style" name="Theme.Leanback.FormWizard" id="0x010302d0" />
<public type="string" name="config_webSettingsDefaultTextEncoding" id="0x01040018" />
<public type="array" name="config_keySystemUuidMapping" id="0x01070005" /> <public type="array" name="config_keySystemUuidMapping" id="0x01070005" />
<!-- An interpolator which accelerates fast but decelerates slowly. --> <!-- An interpolator which accelerates fast but decelerates slowly. -->