diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-10-11 18:25:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-11 18:25:41 -0700 |
| commit | 9b8055b337c5b3efe80d87d318bf0d1df67ecf14 (patch) | |
| tree | 24533ec2a03a8cdd5705c6bbbc03c35c3535e134 /src | |
| parent | 35bbbc6ca40c93c4174f426be295ea912aad82e0 (diff) | |
| parent | 53b14f57c311c3cf170cbe8255d57e3f44b2b80c (diff) | |
| download | packages_apps_settings-9b8055b337c5b3efe80d87d318bf0d1df67ecf14.zip packages_apps_settings-9b8055b337c5b3efe80d87d318bf0d1df67ecf14.tar.gz packages_apps_settings-9b8055b337c5b3efe80d87d318bf0d1df67ecf14.tar.bz2 | |
Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/LocalePicker.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/settings/LocalePicker.java b/src/com/android/settings/LocalePicker.java index 0afa4d5..9bfa07e 100644 --- a/src/com/android/settings/LocalePicker.java +++ b/src/com/android/settings/LocalePicker.java @@ -55,6 +55,7 @@ public class LocalePicker extends com.android.internal.app.LocalePicker mTargetLocale = locale; showDialog(DLG_SHOW_GLOBAL_WARNING); } else { + getActivity().onBackPressed(); LocalePicker.updateLocale(locale); } } |