diff options
| author | Michael Kolb <kolby@google.com> | 2012-03-08 11:03:42 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-08 11:03:42 -0800 |
| commit | b48b51362d22cc091869e8bc7c40b76c22ffc896 (patch) | |
| tree | 390c8bc76baead0a442cc0d07aecab8aa5721c3d | |
| parent | 2cc8f6215927157ebdf60a7cc636fe29d2d565b6 (diff) | |
| parent | 18f252ff8b7f787fd3129706650eafb74fcabef4 (diff) | |
| download | packages_apps_Browser-b48b51362d22cc091869e8bc7c40b76c22ffc896.zip packages_apps_Browser-b48b51362d22cc091869e8bc7c40b76c22ffc896.tar.gz packages_apps_Browser-b48b51362d22cc091869e8bc7c40b76c22ffc896.tar.bz2 | |
Merge "handle locale changes directly in Browser"
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/com/android/browser/Controller.java | 2 |
2 files changed, 3 insertions, 1 deletions
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> 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 @@ public class Controller protected void onConfgurationChanged(Configuration config) { mConfigChanged = true; + // update the menu in case of a locale change + mActivity.invalidateOptionsMenu(); if (mPageDialogsHandler != null) { mPageDialogsHandler.onConfigurationChanged(config); } |