diff options
author | Michael Jurka <mikejurka@google.com> | 2011-07-12 17:20:49 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-12 17:20:49 -0700 |
commit | 40a170aae5579a65da844aa875cd0f5683f90b2f (patch) | |
tree | 46e0d8945bd9f27cea95492e952e3a9f74428b3b | |
parent | 4341d0c2f6f3756aabe0405281a76595566cf756 (diff) | |
parent | 288a36b563801a26d00084cb823435a3ba4cb76c (diff) | |
download | android_packages_apps_Trebuchet-40a170aae5579a65da844aa875cd0f5683f90b2f.tar.gz android_packages_apps_Trebuchet-40a170aae5579a65da844aa875cd0f5683f90b2f.tar.bz2 android_packages_apps_Trebuchet-40a170aae5579a65da844aa875cd0f5683f90b2f.zip |
Merge "Cleaning up code to deal with language changes"
-rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index 1273ea7b1..331f1242c 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -86,7 +86,6 @@ public class LauncherModel extends BroadcastReceiver { // need to do a requery. These are only ever touched from the loader thread. private boolean mWorkspaceLoaded; private boolean mAllAppsLoaded; - private Locale mLocale; private WeakReference<Callbacks> mCallbacks; @@ -569,6 +568,7 @@ public class LauncherModel extends BroadcastReceiver { // to reload. Either way, mAllAppsLoaded will be cleared so it re-reads everything // next time. mAllAppsLoaded = false; + mWorkspaceLoaded = false; startLoaderFromBackground(); } } @@ -655,11 +655,7 @@ public class LauncherModel extends BroadcastReceiver { if (DEBUG_LOADERS) { Log.d(TAG, "loadAndBindWorkspace mWorkspaceLoaded=" + mWorkspaceLoaded); } - Locale l = mContext.getResources().getConfiguration().locale; - if (mLocale != null && !l.equals(mLocale)) { - mWorkspaceLoaded = false; - } - mLocale = l; + if (!mWorkspaceLoaded) { loadWorkspace(); if (mStopped) { |