diff options
| author | Winson Chung <winsonc@google.com> | 2019-06-11 15:01:50 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-11 15:01:50 -0700 |
| commit | ee15e522584f237a516f7c5f47e40326a8a275fe (patch) | |
| tree | 55be9c193a0839dcd918be1717ed597dd5f6d2d0 /src | |
| parent | afff47d4a57490f6e271578abc1c0b3c07815438 (diff) | |
| parent | ca292596736ab8de14e5760753570e392f253e13 (diff) | |
| download | android_packages_apps_Trebuchet-ee15e522584f237a516f7c5f47e40326a8a275fe.tar.gz android_packages_apps_Trebuchet-ee15e522584f237a516f7c5f47e40326a8a275fe.tar.bz2 android_packages_apps_Trebuchet-ee15e522584f237a516f7c5f47e40326a8a275fe.zip | |
Merge "Defer listening for notification changes until resume" into ub-launcher3-qt-dev
am: ca29259673
Change-Id: I135a79f492491c6c5c0bc449bc0c7faabbd8fd10
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 151e2ca13..12f2f9ad9 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/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)) { |