diff options
| author | Narayan Kamath <narayan@google.com> | 2015-04-07 13:08:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-07 13:08:18 +0000 |
| commit | 9d1878674c86ab651926e192845d459bfafb6898 (patch) | |
| tree | e1d11d74085cb10892f2b4b5e8ceb4cbc624616a /core/java/android/content | |
| parent | 9b8178719b4ff9058ddcc1c66e9416439b2348f0 (diff) | |
| parent | 70392818f07f175d4914cef13b12c215ff08f1df (diff) | |
| download | frameworks_base-9d1878674c86ab651926e192845d459bfafb6898.zip frameworks_base-9d1878674c86ab651926e192845d459bfafb6898.tar.gz frameworks_base-9d1878674c86ab651926e192845d459bfafb6898.tar.bz2 | |
Merge "Don't set userSetLocale from Configuration.setLocale."
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index b5eeb30..bc6d4ce 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -1284,14 +1284,12 @@ public final class Configuration implements Parcelable, Comparable<Configuration /** * Set the locale. This is the preferred way for setting up the locale (instead of using the - * direct accessor). This will also set the userLocale and layout direction according to - * the locale. + * direct accessor). This will also set the layout direction according to the locale. * * @param loc The locale. Can be null. */ public void setLocale(Locale loc) { locale = loc; - userSetLocale = true; setLayoutDirection(locale); } |