Merge "Defer listening for notification changes until resume" into ub-launcher3-qt-dev

am: ca29259673

Change-Id: I135a79f492491c6c5c0bc449bc0c7faabbd8fd10

src/com/android/launcher3/Launcher.java

@@ -889,7 +889,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
             mLauncherCallbacks.onStart();
         }
         mAppWidgetHost.setListenIfResumed(true);
-        NotificationListener.setNotificationsChangedListener(mPopupDataProvider);
         RaceConditionTracker.onEvent(ON_START_EVT, EXIT);
     }
 
@@ -909,6 +908,9 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
             // Refresh shortcuts if the permission changed.
             mModel.refreshShortcutsIfRequired();
 
+            // Set the notification listener and fetch updated notifications when we resume
+            NotificationListener.setNotificationsChangedListener(mPopupDataProvider);
+
             DiscoveryBounce.showForHomeIfNeeded(this);
 
             if (mPendingActivityRequestCode != -1 && isInState(NORMAL)) {