diff options
| author | Tony Wickham <twickham@google.com> | 2017-04-20 16:24:09 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2017-04-20 16:24:09 -0700 |
| commit | 623daea93b8ca55b9cc99516df2284bde4322a0c (patch) | |
| tree | ba3bdf1678d0443e327a44525c17db47d5e4ff39 /src/com/android/launcher3/LauncherModel.java | |
| parent | 2feac00e2b9cf46269ffa11bb71ba412e9c3d1b1 (diff) | |
| parent | 6f725f2831e90f1df11f1315906c7554c87c5722 (diff) | |
| download | android_packages_apps_Trebuchet-623daea93b8ca55b9cc99516df2284bde4322a0c.tar.gz android_packages_apps_Trebuchet-623daea93b8ca55b9cc99516df2284bde4322a0c.tar.bz2 android_packages_apps_Trebuchet-623daea93b8ca55b9cc99516df2284bde4322a0c.zip | |
resolve merge conflicts of 6f725f283 to ub-launcher3-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I3559969b62a9a4b1ec04697109636e8cb0fd9fc8
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 5938fba38..53d938506 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -717,6 +717,16 @@ public class LauncherModel extends BroadcastReceiver if (DEBUG_LOADERS) Log.d(TAG, "step 3.2: bind deep shortcuts"); bindDeepShortcuts(); + // Take a break + if (DEBUG_LOADERS) Log.d(TAG, "step 3 completed, wait for idle"); + waitForIdle(); + verifyNotStopped(); + + // fourth step + if (DEBUG_LOADERS) Log.d(TAG, "step 4.1: loading widgets"); + refreshAndBindWidgetsAndShortcuts(getCallback(), false /* bindFirst */, + null /* packageUser */); + synchronized (mLock) { // Everything loaded bind the data. mModelLoaded = true; |