Merge "Calling start/stop listening in onStart/onStop" into ub-launcher3-calgary

src/com/android/launcher3/Launcher.java

@@ -944,6 +944,10 @@ public class Launcher extends Activity
         if (mLauncherCallbacks != null) {
             mLauncherCallbacks.onStop();
         }
+
+        if (Utilities.isNycMR1OrAbove()) {
+            mAppWidgetHost.stopListening();
+        }
     }
 
     @Override
@@ -954,6 +958,10 @@ public class Launcher extends Activity
         if (mLauncherCallbacks != null) {
             mLauncherCallbacks.onStart();
         }
+
+        if (Utilities.isNycMR1OrAbove()) {
+            mAppWidgetHost.startListening();
+        }
     }
 
     @Override

src/com/android/launcher3/LauncherAppWidgetHost.java

@@ -67,12 +67,6 @@ public class LauncherAppWidgetHost extends AppWidgetHost {
         }
     }
 
-    @Override
-    public void stopListening() {
-        super.stopListening();
-        clearViews();
-    }
-
     public void addProviderChangeListener(Runnable callback) {
         mProviderChangeListeners.add(callback);
     }