diff options
| author | Ed Heyl <ed@google.com> | 2011-10-25 19:50:40 +0000 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2011-10-25 19:50:40 +0000 |
| commit | 4f3cb091d6ded1e31db8dd21f019073a7cc9a2e2 (patch) | |
| tree | b99049903f33b9062907af0ea7357ec1f0be1301 /src | |
| parent | 10ba83e40728fc76a35bf7d6b1a2dae3150bf98d (diff) | |
| parent | 323eefca7a2bf72bdd36e6eaefbeb0ab5c2bd15f (diff) | |
| download | android_packages_apps_Trebuchet-4f3cb091d6ded1e31db8dd21f019073a7cc9a2e2.tar.gz android_packages_apps_Trebuchet-4f3cb091d6ded1e31db8dd21f019073a7cc9a2e2.tar.bz2 android_packages_apps_Trebuchet-4f3cb091d6ded1e31db8dd21f019073a7cc9a2e2.zip | |
Merge remote branch 'goog/ics-mr0' into ics-mr1
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index 3ee273214..c06bc0c31 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -121,7 +121,7 @@ public class LauncherModel extends BroadcastReceiver { private static int mCellCountX; private static int mCellCountY; - protected Configuration mPreviousConfig; + protected int mPreviousConfigMcc; public interface Callbacks { public boolean setLoadOnResume(); @@ -152,7 +152,8 @@ public class LauncherModel extends BroadcastReceiver { final Resources res = app.getResources(); mAllAppsLoadDelay = res.getInteger(R.integer.config_allAppsBatchLoadDelay); mBatchSize = res.getInteger(R.integer.config_allAppsBatchSize); - mPreviousConfig = res.getConfiguration(); + Configuration config = res.getConfiguration(); + mPreviousConfigMcc = config.mcc; } public Bitmap getFallbackIcon() { @@ -623,13 +624,13 @@ public class LauncherModel extends BroadcastReceiver { // and we would need to clear out the labels in all apps/workspace. Same handling as // above for ACTION_LOCALE_CHANGED Configuration currentConfig = context.getResources().getConfiguration(); - if((mPreviousConfig.diff(currentConfig) & ActivityInfo.CONFIG_MCC) != 0){ + if (mPreviousConfigMcc != currentConfig.mcc) { Log.d(TAG, "Reload apps on config change. curr_mcc:" - + currentConfig.mcc + " prevmcc:" + mPreviousConfig.mcc); + + currentConfig.mcc + " prevmcc:" + mPreviousConfigMcc); forceReload(); } // Update previousConfig - mPreviousConfig = currentConfig; + mPreviousConfigMcc = currentConfig.mcc; } else if (SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED.equals(action) || SearchManager.INTENT_ACTION_SEARCHABLES_CHANGED.equals(action)) { if (mCallbacks != null) { |