Use GetDefaultLocaleListString for returning LocaleList

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ComponentCallbacks2;
@@ skipping 342 matching lines @@
     // we are a child of a ListView. This may cause many toggles of View focus, which we suppress
     // when in this state.
     private boolean mTemporarilyDetached;
 
     private Handler mHandler;
 
     // True when this AwContents has been destroyed.
     // Do not use directly, call isDestroyed() instead.
     private boolean mIsDestroyed = false;
 
-    private static String sCurrentLocale = "";
+    private static String sCurrentLocales = "";
 
     private static final class AwContentsDestroyRunnable implements Runnable {
         private final long mNativeAwContents;
         // Hold onto a reference to the window (via its wrapper), so that it is not destroyed
         // until we are done here.
         private final WindowAndroidWrapper mWindowAndroid;
 
         private AwContentsDestroyRunnable(
                 long nativeAwContents, WindowAndroidWrapper windowAndroid) {
             mNativeAwContents = nativeAwContents;
@@ skipping 313 matching lines @@
                     nativeTrimMemory(mNativeAwContents, level, visible);
                 }
             });
         }
 
         @Override
         public void onLowMemory() {}
 
         @Override
         public void onConfigurationChanged(Configuration configuration) {
-            setLocale(LocaleUtils.toLanguageTag(configuration.locale));
+            setLocale();

[Seigo Nonaka, 2016/11/15 05:15:59]

setLocale() sounds confusing since it doesn't accept any arguments.
How about "applyLocaleChanges()" or "updateDefaultLocale()"?

[Yirui Huang, 2016/11/16 00:23:45]

Done.

             mSettings.updateAcceptLanguages();
         }
     };
 
     //--------------------------------------------------------------------------------------------
     private class AwDisplayAndroidObserver implements DisplayAndroidObserver {
         @Override
         public void onRotationChanged(int rotation) {}
 
         @Override
@@ skipping 30 matching lines @@
      * @param dependencyFactory an instance of the DependencyFactory used to provide instances of
      *                          classes that this class depends on.
      *
      * This version of the constructor is used in test code to inject test versions of the above
      * documented classes.
      */
     public AwContents(AwBrowserContext browserContext, ViewGroup containerView, Context context,
             InternalAccessDelegate internalAccessAdapter,
             NativeDrawGLFunctorFactory nativeDrawGLFunctorFactory, AwContentsClient contentsClient,
             AwSettings settings, DependencyFactory dependencyFactory) {
-        setLocale(LocaleUtils.getDefaultLocaleString());
+        setLocale();
         settings.updateAcceptLanguages();
 
         mBrowserContext = browserContext;
 
         // setWillNotDraw(false) is required since WebView draws it's own contents using it's
         // container view. If this is ever not the case we should remove this, as it removes
         // Android's gatherTransparentRegion optimization for the view.
         mContainerView = containerView;
         mContainerView.setWillNotDraw(false);
 
@@ skipping 255 matching lines @@
             final boolean listenToActivityState = false;
             wrapper = new WindowAndroidWrapper(
                     new ActivityWindowAndroid(context, listenToActivityState));
         } else {
             wrapper = new WindowAndroidWrapper(new WindowAndroid(context));
         }
         sContextWindowMap.put(context, wrapper);
         return wrapper;
     }
 
+    // Set and keep updating locales for webview.

[Seigo Nonaka, 2016/11/15 05:15:59]

I'm confused with "keep updating". What does it indicate?

[Yirui Huang, 2016/11/16 00:23:45]

Done.

     @VisibleForTesting
-    public static void setLocale(String locale) {
-        if (!sCurrentLocale.equals(locale)) {
-            sCurrentLocale = locale;
-            nativeSetLocale(sCurrentLocale);
+    public static void setLocale() {
+        String locales = LocaleUtils.getDefaultLocaleListString();
+        if (!sCurrentLocales.equals(locales)) {
+            sCurrentLocales = locales;
+            nativeSetLocale(LocaleUtils.getDefaultLocaleString(), sCurrentLocales);

[Seigo Nonaka, 2016/11/15 05:15:59]

I think it is good to leave comments why you still need to pass the single
locale.

[Yirui Huang, 2016/11/16 00:23:45]

Done.

         }
     }
 
     private void updateNativeAwGLFunctor() {
         nativeSetAwGLFunctor(mNativeAwContents,
                 mCurrentFunctor != null ? mCurrentFunctor.getNativeAwGLFunctor() : 0);
     }
 
     /* Common initialization routine for adopting a native AwContents instance into this
      * java instance.
@@ skipping 2111 matching lines @@
             }
             mIsAttachedToWindow = true;
 
             mContentViewCore.onAttachedToWindow();
             nativeOnAttachedToWindow(mNativeAwContents, mContainerView.getWidth(),
                     mContainerView.getHeight());
             updateHardwareAcceleratedFeaturesToggle();
             postUpdateContentViewCoreVisibility();
             mCurrentFunctor.onAttachedToWindow();
 
-            setLocale(LocaleUtils.getDefaultLocaleString());
+            setLocale();
             mSettings.updateAcceptLanguages();
 
             if (mComponentCallbacks != null) return;
             mComponentCallbacks = new AwComponentCallbacks();
             mContext.registerComponentCallbacks(mComponentCallbacks);
         }
 
         @Override
         public void onDetachedFromWindow() {
             if (isDestroyed(NO_WARN)) return;
@@ skipping 131 matching lines @@
     //--------------------------------------------------------------------------------------------
 
     private static native long nativeInit(AwBrowserContext browserContext);
     private static native void nativeDestroy(long nativeAwContents);
     private static native void nativeSetForceAuxiliaryBitmapRendering(
             boolean forceAuxiliaryBitmapRendering);
     private static native void nativeSetAwDrawSWFunctionTable(long functionTablePointer);
     private static native void nativeSetAwDrawGLFunctionTable(long functionTablePointer);
     private static native int nativeGetNativeInstanceCount();
     private static native void nativeSetShouldDownloadFavicons();
-    private static native void nativeSetLocale(String locale);
+    private static native void nativeSetLocale(String locale, String locales);
 
     private native void nativeSetJavaPeers(long nativeAwContents, AwContents awContents,
             AwWebContentsDelegate webViewWebContentsDelegate,
             AwContentsClientBridge contentsClientBridge,
             AwContentsIoThreadClient ioThreadClient,
             InterceptNavigationDelegate navigationInterceptionDelegate);
     private native WebContents nativeGetWebContents(long nativeAwContents);
     private native void nativeSetAwGLFunctor(long nativeAwContents, long nativeAwGLFunctor);
 
     private native void nativeDocumentHasImages(long nativeAwContents, Message message);
@@ skipping 62 matching lines @@
 
     private native void nativePostMessageToFrame(long nativeAwContents, String frameId,
             String message, String targetOrigin, int[] msgPorts);
 
     private native void nativeCreateMessageChannel(
             long nativeAwContents, AppWebMessagePort[] ports);
 
     private native void nativeGrantFileSchemeAccesstoChildProcess(long nativeAwContents);
     private native void nativeResumeLoadingCreatedPopupWebContents(long nativeAwContents);
 }