From 4792ff6d3ee82332787327fb6618616696dbcb53 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Mon, 8 Oct 2012 15:22:39 -0700
Subject: [PATCH] update app widget style

---
 .../track_widget_background.9.png             | Bin 3006 -> 3072 bytes
 MyTracks/res/layout/track_widget_4x4.xml      |   4 +--
 MyTracks/res/values/styles.xml                |   6 +---
 .../mytracks/widgets/TrackWidgetProvider.java |  30 +++++++++---------
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/MyTracks/res/drawable-mdpi/track_widget_background.9.png b/MyTracks/res/drawable-mdpi/track_widget_background.9.png
index 8937cd345fcacf5e2213696c6c0cc12715cc1fa8..15052245e10a9444d49b07ddb9ce1ef0b0080e6b 100644
GIT binary patch
delta 424
zcmV;Z0ayOM7l0U$BP9R{a7bBm000XU000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U;7
zDMJc>CDNZW0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z0003kNkl<Zc-pMhJxT;Y5QgEW*Ih6b6A={g4*q}#5CcJsyn_aA;59Vx66OZ7o<Kn`
zFc1tx6vRY~3}n$VnO%Bucif-(pct5*eyOj2yQ(Hdgkh9Y3Z(zOiwLP7G^MnJZLDD)
zjcmD%S6t&9Po>b5QUeFrL2U>FKLz*{Uw@zl@E9vb*A1FzM?_CH&BAVNj9A5C*KtHh
zDJ|n{NXunMu@@1K9mp=~V`kZjdco;twlN{F6B`OTEKX=$#_2+*Rii1W7oGB;Le++M
zX}uBjonO>PMbM8NdRGzjK8Idb1Z~OAvw;gNOaOerRz$RG**H5Yp5v%ze_rsn*vIFH
zz|Ue_-gXDdfUam_vs26^<<r6mo_mIL$)*{sV-B;~`**zIs$VG%{GCjy-vIzd*;y+5
STqWB80000<MNUMnLSTY2p{tqz

delta 339
zcmV-Z0j&Oj7`_*fBL)gXX+uL$u}DJ-7JxY=5dZ)H24YJ`L;(K){{a7>y{D6rAs2rD
z2XskIMF-mi7X}S99Q1kM0002|Nkl<ZILob+%@Kky6ohxtGOz+}<RleXfdyCr6>y*e
z>tMz^6+i`azzk)qmxPHRiY9wZUcT(h&jS0Uy@kh5lX;$BNEReBNfXJ3q(M?gvfWz8
zEf|2BWV&fv8Ua-A;47#x<__Tc!?Axf07`%05C{Z-48RG%>^NDp{43DuD(SL<0;mzD
z`UPrlISnC_Or6`r4itzW$8pds5;Sv<Uy`O6P)TR!lqCB|PW!oiNkb&3gAeT@K|BAV
zTKktnfTPO+|M6FWMyu72vb!{Y0vkWAlEq~C2Y8iI$(y25((T(BOByBJmcS>?<hQM~
llKkX9lk9gVzcB_e^#rqEZ;BRZy&C`k002ovPDHLkV1iehkY@k@

diff --git a/MyTracks/res/layout/track_widget_4x4.xml b/MyTracks/res/layout/track_widget_4x4.xml
index 1aa48114c..39ce5ea58 100644
--- a/MyTracks/res/layout/track_widget_4x4.xml
+++ b/MyTracks/res/layout/track_widget_4x4.xml
@@ -29,7 +29,7 @@ limitations under the License.
         <LinearLayout style="@style/TrackWidgetItemContainer4x4" >
           <TextView
             android:id="@+id/track_widget_item1_label"
-            style="@style/TrackWidgetLabel4x4" />
+            style="@style/TrackWidgetLabel4x3" />
           <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
             <TextView
               android:id="@+id/track_widget_item1_value"
@@ -59,7 +59,7 @@ limitations under the License.
         <LinearLayout style="@style/TrackWidgetItemContainer4x4" >
           <TextView
             android:id="@+id/track_widget_item3_label"
-            style="@style/TrackWidgetLabel4x4" />
+            style="@style/TrackWidgetLabel4x3" />
           <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
             <TextView
               android:id="@+id/track_widget_item3_value"
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index 2eb104fd8..f4177c4d8 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -313,10 +313,6 @@ limitations under the License.
   <style name="TrackWidgetLabel4x3" parent="@style/TrackWidgetLabel">
     <item name="android:textSize">14dp</item>
   </style>
-  <!-- track widget label 4x4 -->
-  <style name="TrackWidgetLabel4x4" parent="@style/TrackWidgetLabel">
-    <item name="android:textSize">18dp</item>
-  </style>
   <!-- track widget logo -->
   <style name="TrackWidgetLogo">
     <item name="android:layout_alignParentRight">true</item>
@@ -392,7 +388,7 @@ limitations under the License.
   </style>
   <!-- track widget value container 4x3 -->
   <style name="TrackWidgetValueContainer4x3" parent="@style/TrackWidgetValueContainer">
-    <item name="android:layout_marginTop">0dp</item>
+    <item name="android:layout_marginTop">-2dp</item>
   </style>
   <!-- track widget vertical line -->
   <style name="TrackWidgetVerticalLine">
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 9297124df..4e070ab39 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
@@ -56,7 +56,7 @@ public class TrackWidgetProvider extends AppWidgetProvider {
 
   // Array of appwidget id to height size in cells
   private static final SparseIntArray HEIGHT_SIZE = new SparseIntArray();
-  private static final int DEFAULT_HEIGHT = 2;
+  private static final int DEFAULT_SIZE = 2;
 
   @Override
   public void onReceive(Context context, Intent intent) {
@@ -74,7 +74,7 @@ public class TrackWidgetProvider extends AppWidgetProvider {
           new ComponentName(context, TrackWidgetProvider.class));
       for (int appWidgetId : appWidgetIds) {
         RemoteViews remoteViews = getRemoteViews(
-            context, trackId, HEIGHT_SIZE.get(appWidgetId, DEFAULT_HEIGHT));
+            context, trackId, HEIGHT_SIZE.get(appWidgetId, DEFAULT_SIZE));
         appWidgetManager.updateAppWidget(appWidgetId, remoteViews);
       }
     }
@@ -84,24 +84,24 @@ public class TrackWidgetProvider extends AppWidgetProvider {
   @Override
   public void onAppWidgetOptionsChanged(
       Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {
-    int heightSize;
-    if (newOptions == null) {
-      heightSize = 2;
-    } else {
+    if (newOptions != null) {
+      int size;
       int height = newOptions.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT);
-      if (height >= FOUR_CELLS) {
-        heightSize = 4;
+      if (height == 0) {
+        size = 2;
+      } else if (height >= FOUR_CELLS) {
+        size = 4;
       } else if (height >= THREE_CELLS) {
-        heightSize = 3;
+        size = 3;
       } else if (height >= TWO_CELLS) {
-        heightSize = 2;
+        size = 2;
       } else {
-        heightSize = 1;
+        size = 1;
       }
+      HEIGHT_SIZE.put(appWidgetId, size);
+      RemoteViews remoteViews = getRemoteViews(context, -1L, size);
+      appWidgetManager.updateAppWidget(appWidgetId, remoteViews);
     }
-    HEIGHT_SIZE.put(appWidgetId, heightSize);
-    RemoteViews remoteViews = getRemoteViews(context, -1L, heightSize);
-    appWidgetManager.updateAppWidget(appWidgetId, remoteViews);
   }
 
   /**
@@ -114,7 +114,7 @@ public class TrackWidgetProvider extends AppWidgetProvider {
   public static void updateAppWidget(
       Context context, AppWidgetManager appWidgetManager, int appWidgetId) {
     RemoteViews remoteViews = getRemoteViews(
-        context, -1L, HEIGHT_SIZE.get(appWidgetId, DEFAULT_HEIGHT));
+        context, -1L, HEIGHT_SIZE.get(appWidgetId, DEFAULT_SIZE));
     appWidgetManager.updateAppWidget(appWidgetId, remoteViews);
   }