diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-06-18 13:56:59 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-06-18 14:04:00 -0700 |
commit | 2003c75ac43ecd66ee8a89142b7969feb993abe7 (patch) | |
tree | 1e2998554d7f413f125bd932db2ce330539a85f8 /src/com/android/launcher3/LauncherModel.java | |
parent | 230eade4a35d9dfe9b186da46e38ca05f0256a69 (diff) | |
download | android_packages_apps_Trebuchet-2003c75ac43ecd66ee8a89142b7969feb993abe7.tar.gz android_packages_apps_Trebuchet-2003c75ac43ecd66ee8a89142b7969feb993abe7.tar.bz2 android_packages_apps_Trebuchet-2003c75ac43ecd66ee8a89142b7969feb993abe7.zip |
Cancelling launcher reload on mcc change
Bug: 21022833
Change-Id: Iccd477e7b1638d162e1a500cdb7a52b8d359c657
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index d2112afb4..f09ad7599 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -30,8 +30,6 @@ import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.pm.ProviderInfo; import android.content.pm.ResolveInfo; -import android.content.res.Configuration; -import android.content.res.Resources; import android.database.Cursor; import android.graphics.Bitmap; import android.net.Uri; @@ -177,8 +175,6 @@ public class LauncherModel extends BroadcastReceiver @Thunk IconCache mIconCache; - protected int mPreviousConfigMcc; - @Thunk final LauncherAppsCompat mLauncherApps; @Thunk final UserManagerCompat mUserManager; @@ -243,9 +239,6 @@ public class LauncherModel extends BroadcastReceiver mBgWidgetsModel = new WidgetsModel(context, iconCache, appFilter); mIconCache = iconCache; - final Resources res = context.getResources(); - Configuration config = res.getConfiguration(); - mPreviousConfigMcc = config.mcc; mLauncherApps = LauncherAppsCompat.getInstance(context); mUserManager = UserManagerCompat.getInstance(context); } @@ -1286,18 +1279,6 @@ public class LauncherModel extends BroadcastReceiver if (Intent.ACTION_LOCALE_CHANGED.equals(action)) { // If we have changed locale we need to clear out the labels in all apps/workspace. forceReload(); - } else if (Intent.ACTION_CONFIGURATION_CHANGED.equals(action)) { - // Check if configuration change was an mcc/mnc change which would affect app resources - // 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 (mPreviousConfigMcc != currentConfig.mcc) { - Log.d(TAG, "Reload apps on config change. curr_mcc:" - + currentConfig.mcc + " prevmcc:" + mPreviousConfigMcc); - forceReload(); - } - // Update previousConfig - mPreviousConfigMcc = currentConfig.mcc; } else if (SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED.equals(action) || SearchManager.INTENT_ACTION_SEARCHABLES_CHANGED.equals(action)) { Callbacks callbacks = getCallback(); |