diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-10-12 11:10:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-12 11:10:31 -0700 |
| commit | b417ffc76874abc93368dd7257ffe4191f32d250 (patch) | |
| tree | 35557f1a6ad3193269034bef96a6b964eac399b6 /src/com | |
| parent | d5d942f71d6aefdb4ac33327a786ad67c83addb8 (diff) | |
| parent | a6b3ecbebfa2d5de7525184747116edaea1c148f (diff) | |
| download | packages_apps_Settings-b417ffc76874abc93368dd7257ffe4191f32d250.zip packages_apps_Settings-b417ffc76874abc93368dd7257ffe4191f32d250.tar.gz packages_apps_Settings-b417ffc76874abc93368dd7257ffe4191f32d250.tar.bz2 | |
am a6b3ecbe: am 85cd2c56: am 9b8055b3: Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev
* commit 'a6b3ecbebfa2d5de7525184747116edaea1c148f':
Fix a regression in exiting the activity on picking a locale
Diffstat (limited to 'src/com')
| -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); } } |