diff options
-rw-r--r-- | res/values-it/strings.xml | 2 | ||||
-rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index ec61dc948..5070c88c9 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -84,7 +84,7 @@ <string name="uninstall_system_app_text" msgid="7488523163288397451">"Questa è un\'applicazione di sistema e non può essere disinstallata."</string> <string name="dream_name" msgid="2847171357608437154">"Lanciamissili"</string> <string name="folder_hint_text" msgid="8633351560105748141">"Cartella senza nome"</string> - <string name="workspace_cling_title" msgid="738396473989890567">"Fai come se fossi a casa tua."</string> + <string name="workspace_cling_title" msgid="738396473989890567">"Mettiti comodo"</string> <string name="workspace_cling_move_item" msgid="791013895761065070">"Puoi posizionare le tue applicazioni preferite qui."</string> <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Per visualizzare tutte le tue applicazioni, tocca il cerchio."</string> <string name="all_apps_cling_title" msgid="2559734712581447107">"Scegli alcune applicazioni"</string> 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) { |