summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/LauncherModel.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-07-12 16:53:48 -0700
committerMichael Jurka <mikejurka@google.com>2011-07-12 16:53:48 -0700
commit288a36b563801a26d00084cb823435a3ba4cb76c (patch)
tree90eba67558965f2b8a4d382cf77816778d1c179d /src/com/android/launcher2/LauncherModel.java
parentc2f801e770b4f80354b3edb722ec04222251990c (diff)
downloadandroid_packages_apps_Trebuchet-288a36b563801a26d00084cb823435a3ba4cb76c.tar.gz
android_packages_apps_Trebuchet-288a36b563801a26d00084cb823435a3ba4cb76c.tar.bz2
android_packages_apps_Trebuchet-288a36b563801a26d00084cb823435a3ba4cb76c.zip
Cleaning up code to deal with language changes
Diffstat (limited to 'src/com/android/launcher2/LauncherModel.java')
-rw-r--r--src/com/android/launcher2/LauncherModel.java8
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) {