android_webview/java/src/org/chromium/android_webview/AwContents.java - Issue 2406203002: Use BCP47 compliant format for locale representation

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/java/src/org/chromium/android_webview/AwContents.java

Issue 2406203002: Use BCP47 compliant format for locale representation (Closed)

Patch Set: cleanup LocaleUtils, update codes that are not reverted from "rebase master" Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/browser/aw_content_browser_client.cc ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java » ('j') | base/android/java/src/org/chromium/base/LocaleUtils.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/java/src/org/chromium/android_webview/AwContents.java

diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java

index a21d244fd978a3570cf0eac90c6aaed2b7d85eee..cf36a439a055bdad48d446b322c668a510675841 100644

--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java

+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java

@@ -705,7 +705,7 @@ public class AwContents implements SmartClipProvider,

@Override

public void onConfigurationChanged(Configuration configuration) {

- setLocale(LocaleUtils.getLocale(configuration.locale));

+ setLocale(LocaleUtils.getLocaleString(configuration.locale));

mSettings.updateAcceptLanguages();

}

};

@@ -741,7 +741,7 @@ public class AwContents implements SmartClipProvider,

InternalAccessDelegate internalAccessAdapter,

NativeDrawGLFunctorFactory nativeDrawGLFunctorFactory, AwContentsClient contentsClient,

AwSettings settings, DependencyFactory dependencyFactory) {

- setLocale(LocaleUtils.getDefaultLocale());

+ setLocale(LocaleUtils.getDefaultLocaleString());

settings.updateAcceptLanguages();

mBrowserContext = browserContext;

@@ -3149,7 +3149,7 @@ public class AwContents implements SmartClipProvider,

postUpdateContentViewCoreVisibility();

mCurrentFunctor.onAttachedToWindow();

- setLocale(LocaleUtils.getDefaultLocale());

+ setLocale(LocaleUtils.getDefaultLocaleString());

mSettings.updateAcceptLanguages();

if (mComponentCallbacks != null) return;