commit 18f252ff8b7f787fd3129706650eafb74fcabef4
author Michael Kolb <kolby@google.com> Tue Mar 06 13:36:20 2012 -0800
committer Michael Kolb <kolby@google.com> Thu Mar 08 10:51:28 2012 -0800
tree 49c1829602b3a54baeefed18406103f58fea93ac
parent f3cbcc97081ae4a60269b66606a7b4285011e20e

handle locale changes directly in Browser

    Bug: 6125790

Change-Id: I1326b5944260fe29ba9d68256d118238bcfdc3a0

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 23bc975..0c2e6b3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -66,7 +66,7 @@
                   android:label="@string/application_name"
                   android:launchMode="singleTask"
                   android:alwaysRetainTaskState="true"
-                  android:configChanges="orientation|keyboardHidden|keyboard|screenSize"
+                  android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"
                   android:theme="@style/BrowserTheme"
                   android:windowSoftInputMode="adjustResize" >
             <intent-filter>

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 923dfed..0b49aff 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -604,6 +604,8 @@
 
     protected void onConfgurationChanged(Configuration config) {
         mConfigChanged = true;
+        // update the menu in case of a locale change
+        mActivity.invalidateOptionsMenu();
         if (mPageDialogsHandler != null) {
             mPageDialogsHandler.onConfigurationChanged(config);
         }