diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-02 00:15:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-02 00:15:18 +0000 |
| commit | 2f03c4ae9f9d992b823d4f4f1c32ea57e6006622 (patch) | |
| tree | f79d2dd1b5ffd46d9ec4f122e88adb03b6e2b4b0 | |
| parent | 8fd4436b27221b90a09c59eb1f5554ecf443a9f8 (diff) | |
| parent | 0be752ca6b168872dfe18c576b61c745e2395dec (diff) | |
| download | android_packages_apps_Trebuchet-2f03c4ae9f9d992b823d4f4f1c32ea57e6006622.tar.gz android_packages_apps_Trebuchet-2f03c4ae9f9d992b823d4f4f1c32ea57e6006622.tar.bz2 android_packages_apps_Trebuchet-2f03c4ae9f9d992b823d4f4f1c32ea57e6006622.zip | |
am 0be752ca: Merge "Handling managed profile creation in the model as the activity can get killed in the background." into ub-launcher3-burnaby
* commit '0be752ca6b168872dfe18c576b61c745e2395dec':
Handling managed profile creation in the model as the activity can get killed in the background.
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 5 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherAppState.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 2ef5d0ac4..7688a3dc7 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1675,9 +1675,6 @@ public class Launcher extends Activity mModel.startLoader(false, PagedView.INVALID_RESTORE_PAGE, LauncherModel.LOADER_FLAG_CLEAR_WORKSPACE | LauncherModel.LOADER_FLAG_MIGRATE_SHORTCUTS); - } else if (LauncherAppsCompat.ACTION_MANAGED_PROFILE_ADDED.equals(action) - || LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED.equals(action)) { - getModel().forceReload(); } } }; @@ -1691,8 +1688,6 @@ public class Launcher extends Activity filter.addAction(Intent.ACTION_SCREEN_OFF); filter.addAction(Intent.ACTION_USER_PRESENT); // For handling managed profiles - filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_ADDED); - filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED); if (ENABLE_DEBUG_INTENTS) { filter.addAction(DebugIntents.DELETE_DATABASE); filter.addAction(DebugIntents.MIGRATE_DATABASE); diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java index 7f31e4999..d51df32b0 100644 --- a/src/com/android/launcher3/LauncherAppState.java +++ b/src/com/android/launcher3/LauncherAppState.java @@ -112,6 +112,10 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks { filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED); filter.addAction(SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED); filter.addAction(SearchManager.INTENT_ACTION_SEARCHABLES_CHANGED); + // For handling managed profiles + filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_ADDED); + filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED); + sContext.registerReceiver(mModel, filter); } diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 957073552..e62c689fb 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1279,6 +1279,9 @@ public class LauncherModel extends BroadcastReceiver if (callbacks != null) { callbacks.bindSearchablesChanged(); } + } else if (LauncherAppsCompat.ACTION_MANAGED_PROFILE_ADDED.equals(action) + || LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED.equals(action)) { + forceReload(); } } |