merge heads

MyTracks/res/layout/stats.xml

@@ -68,7 +68,7 @@ limitations under the License.
 
       <!-- Total distance and max speed -->
       <TableRow
-        android:padding="1dip">
+        android:padding="1dp">
         <TextView
           android:id="@+id/total_distance_label"
           android:layout_column="1"
@@ -204,8 +204,6 @@ limitations under the License.
             style="@style/StatsUnit" />
           <TextView
 	          style="@style/StatsDivider" />
-            android:layout_height="3dip"
-            android:layout_width="fill_parent" />
           <TextView
             android:id="@+id/average_moving_speed_unit_label_bottom"
             style="@style/StatsUnit" />
@@ -349,17 +347,16 @@ limitations under the License.
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:layout_weight="0"
-    android:padding="3dip"
+    android:padding="3dp"
     android:visibility="gone">
     <ProgressBar
       android:layout_weight="1"
-      android:layout_height="0dip"
+      android:layout_height="0dp"
       android:layout_width="wrap_content"
-      android:maxWidth="80dip"
-      android:maxHeight="80dip"
-      android:minWidth="80dip"
-      android:minHeight="80dip"
+      android:maxWidth="80dp"
+      android:maxHeight="80dp"
+      android:minWidth="80dp"
+      android:minHeight="80dp"
       android:layout_gravity="center"/>
   </LinearLayout>
 </RelativeLayout>