From 5447b357d22df94f062d0375a3638c65189da0dd Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Thu, 11 Apr 2013 13:55:39 -0700
Subject: [PATCH] Update widget on software update.

---
 .../widgets/TrackWidgetConfigActivity.java    |  2 +-
 .../mytracks/widgets/TrackWidgetProvider.java | 42 +++++++++++--------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java
index 616723ef6..0d2e8562a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java
@@ -86,7 +86,7 @@ public class TrackWidgetConfigActivity extends Activity {
         AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(
             TrackWidgetConfigActivity.this);
         TrackWidgetProvider.updateAppWidget(
-            TrackWidgetConfigActivity.this, appWidgetManager, appWidgetId);
+            TrackWidgetConfigActivity.this, appWidgetManager, appWidgetId, -1L);
         PreferencesUtils.setInt(TrackWidgetConfigActivity.this, R.string.track_widget_item1,
             item1.getSelectedItemPosition());
         PreferencesUtils.setInt(TrackWidgetConfigActivity.this, R.string.track_widget_item2,
diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
index 057af6613..138b57a80 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
@@ -89,23 +89,15 @@ public class TrackWidgetProvider extends AppWidgetProvider {
   @Override
   public void onEnabled(Context context) {
     super.onEnabled(context);
-    // Need to update all widgets after phone reboot
+    // Need to update all app widgets after phone reboot
     updateAllAppWidgets(context, -1L);
   }
 
-  /**
-   * Updates all app widgets.
-   * 
-   * @param context the context
-   * @param trackId track id
-   */
-  private void updateAllAppWidgets(Context context, long trackId) {
-    AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
-    int[] appWidgetIds = appWidgetManager.getAppWidgetIds(
-        new ComponentName(context, TrackWidgetProvider.class));
-    for (int appWidgetId : appWidgetIds) {
-      updateAppWidget(context, appWidgetManager, appWidgetId);
-    }
+  @Override
+  public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+    super.onUpdate(context, appWidgetManager, appWidgetIds);
+    // Need to update all app widgets after software update
+    updateAllAppWidgets(context, -1L);
   }
 
   @TargetApi(16)
@@ -135,7 +127,7 @@ public class TrackWidgetProvider extends AppWidgetProvider {
       int size = ApiAdapterFactory.getApiAdapter().getAppWidgetSize(appWidgetManager, appWidgetId);
       if (size != newSize) {
         ApiAdapterFactory.getApiAdapter().setAppWidgetSize(appWidgetManager, appWidgetId, newSize);
-        updateAppWidget(context, appWidgetManager, appWidgetId);
+        updateAppWidget(context, appWidgetManager, appWidgetId, -1L);
       }
     }
   }
@@ -146,13 +138,29 @@ public class TrackWidgetProvider extends AppWidgetProvider {
    * @param context the context
    * @param appWidgetManager the app widget manager
    * @param appWidgetId the app widget id
+   * @param trackId the track id. -1L to not specify one
    */
   public static void updateAppWidget(
-      Context context, AppWidgetManager appWidgetManager, int appWidgetId) {
+      Context context, AppWidgetManager appWidgetManager, int appWidgetId, long trackId) {
     int size = ApiAdapterFactory.getApiAdapter().getAppWidgetSize(appWidgetManager, appWidgetId);
-    RemoteViews remoteViews = getRemoteViews(context, -1L, size);
+    RemoteViews remoteViews = getRemoteViews(context, trackId, size);
     appWidgetManager.updateAppWidget(appWidgetId, remoteViews);
   }
+  
+  /**
+   * Updates all app widgets.
+   * 
+   * @param context the context
+   * @param trackId track id
+   */
+  private static void updateAllAppWidgets(Context context, long trackId) {
+    AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
+    int[] appWidgetIds = appWidgetManager.getAppWidgetIds(
+        new ComponentName(context, TrackWidgetProvider.class));
+    for (int appWidgetId : appWidgetIds) {
+      updateAppWidget(context, appWidgetManager, appWidgetId, trackId);
+    }
+  }
 
   /**
    * Gets the remote views.