Merge "Revert "Calling start/stop listening in onStart/onStop"" into ub-launcher3-calgary
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 51df013..a58cddd 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -958,9 +958,6 @@
protected void onStop() {
super.onStop();
FirstFrameAnimatorHelper.setIsVisible(false);
- if (Utilities.isNycOrAbove()) {
- mAppWidgetHost.stopListening();
- }
if (mLauncherCallbacks != null) {
mLauncherCallbacks.onStop();
@@ -971,9 +968,6 @@
protected void onStart() {
super.onStart();
FirstFrameAnimatorHelper.setIsVisible(true);
- if (Utilities.isNycOrAbove()) {
- mAppWidgetHost.startListening();
- }
if (mLauncherCallbacks != null) {
mLauncherCallbacks.onStart();
diff --git a/src/com/android/launcher3/LauncherAppWidgetHost.java b/src/com/android/launcher3/LauncherAppWidgetHost.java
index 1510558..8c23ff3 100644
--- a/src/com/android/launcher3/LauncherAppWidgetHost.java
+++ b/src/com/android/launcher3/LauncherAppWidgetHost.java
@@ -82,6 +82,12 @@
}
}
+ @Override
+ public void stopListening() {
+ super.stopListening();
+ clearViews();
+ }
+
public void addProviderChangeListener(Runnable callback) {
mProviderChangeListeners.add(callback);
}