diff --git a/MyTracks/res/drawable-hdpi/ic_menu_lastsegment.png b/MyTracks/res/drawable-hdpi/ic_menu_lastsegment.png
deleted file mode 100644
index b7763525b..000000000
Binary files a/MyTracks/res/drawable-hdpi/ic_menu_lastsegment.png and /dev/null differ
diff --git a/MyTracks/res/drawable-hdpi/ic_menu_pauserecording.png b/MyTracks/res/drawable-hdpi/ic_menu_pauserecording.png
deleted file mode 100644
index f6afcf025..000000000
Binary files a/MyTracks/res/drawable-hdpi/ic_menu_pauserecording.png and /dev/null differ
diff --git a/MyTracks/res/drawable-ldpi/ic_menu_pauserecording.png b/MyTracks/res/drawable-ldpi/ic_menu_pauserecording.png
deleted file mode 100644
index 4a0723637..000000000
Binary files a/MyTracks/res/drawable-ldpi/ic_menu_pauserecording.png and /dev/null differ
diff --git a/MyTracks/res/drawable/appwidget_background.9.png b/MyTracks/res/drawable-mdpi/appwidget_background.9.png
similarity index 100%
rename from MyTracks/res/drawable/appwidget_background.9.png
rename to MyTracks/res/drawable-mdpi/appwidget_background.9.png
diff --git a/MyTracks/res/drawable/appwidget_button_disabled.png b/MyTracks/res/drawable-mdpi/appwidget_button_disabled.png
similarity index 100%
rename from MyTracks/res/drawable/appwidget_button_disabled.png
rename to MyTracks/res/drawable-mdpi/appwidget_button_disabled.png
diff --git a/MyTracks/res/drawable/appwidget_button_enabled.png b/MyTracks/res/drawable-mdpi/appwidget_button_enabled.png
similarity index 100%
rename from MyTracks/res/drawable/appwidget_button_enabled.png
rename to MyTracks/res/drawable-mdpi/appwidget_button_enabled.png
diff --git a/MyTracks/res/drawable/arrow_0.png b/MyTracks/res/drawable-mdpi/arrow_0.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_0.png
rename to MyTracks/res/drawable-mdpi/arrow_0.png
diff --git a/MyTracks/res/drawable/arrow_100.png b/MyTracks/res/drawable-mdpi/arrow_100.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_100.png
rename to MyTracks/res/drawable-mdpi/arrow_100.png
diff --git a/MyTracks/res/drawable/arrow_120.png b/MyTracks/res/drawable-mdpi/arrow_120.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_120.png
rename to MyTracks/res/drawable-mdpi/arrow_120.png
diff --git a/MyTracks/res/drawable/arrow_140.png b/MyTracks/res/drawable-mdpi/arrow_140.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_140.png
rename to MyTracks/res/drawable-mdpi/arrow_140.png
diff --git a/MyTracks/res/drawable/arrow_160.png b/MyTracks/res/drawable-mdpi/arrow_160.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_160.png
rename to MyTracks/res/drawable-mdpi/arrow_160.png
diff --git a/MyTracks/res/drawable/arrow_180.png b/MyTracks/res/drawable-mdpi/arrow_180.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_180.png
rename to MyTracks/res/drawable-mdpi/arrow_180.png
diff --git a/MyTracks/res/drawable/arrow_20.png b/MyTracks/res/drawable-mdpi/arrow_20.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_20.png
rename to MyTracks/res/drawable-mdpi/arrow_20.png
diff --git a/MyTracks/res/drawable/arrow_200.png b/MyTracks/res/drawable-mdpi/arrow_200.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_200.png
rename to MyTracks/res/drawable-mdpi/arrow_200.png
diff --git a/MyTracks/res/drawable/arrow_220.png b/MyTracks/res/drawable-mdpi/arrow_220.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_220.png
rename to MyTracks/res/drawable-mdpi/arrow_220.png
diff --git a/MyTracks/res/drawable/arrow_240.png b/MyTracks/res/drawable-mdpi/arrow_240.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_240.png
rename to MyTracks/res/drawable-mdpi/arrow_240.png
diff --git a/MyTracks/res/drawable/arrow_260.png b/MyTracks/res/drawable-mdpi/arrow_260.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_260.png
rename to MyTracks/res/drawable-mdpi/arrow_260.png
diff --git a/MyTracks/res/drawable/arrow_280.png b/MyTracks/res/drawable-mdpi/arrow_280.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_280.png
rename to MyTracks/res/drawable-mdpi/arrow_280.png
diff --git a/MyTracks/res/drawable/arrow_300.png b/MyTracks/res/drawable-mdpi/arrow_300.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_300.png
rename to MyTracks/res/drawable-mdpi/arrow_300.png
diff --git a/MyTracks/res/drawable/arrow_320.png b/MyTracks/res/drawable-mdpi/arrow_320.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_320.png
rename to MyTracks/res/drawable-mdpi/arrow_320.png
diff --git a/MyTracks/res/drawable/arrow_340.png b/MyTracks/res/drawable-mdpi/arrow_340.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_340.png
rename to MyTracks/res/drawable-mdpi/arrow_340.png
diff --git a/MyTracks/res/drawable/arrow_40.png b/MyTracks/res/drawable-mdpi/arrow_40.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_40.png
rename to MyTracks/res/drawable-mdpi/arrow_40.png
diff --git a/MyTracks/res/drawable/arrow_60.png b/MyTracks/res/drawable-mdpi/arrow_60.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_60.png
rename to MyTracks/res/drawable-mdpi/arrow_60.png
diff --git a/MyTracks/res/drawable/arrow_80.png b/MyTracks/res/drawable-mdpi/arrow_80.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_80.png
rename to MyTracks/res/drawable-mdpi/arrow_80.png
diff --git a/MyTracks/res/drawable/blue_pushpin.png b/MyTracks/res/drawable-mdpi/blue_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable/blue_pushpin.png
rename to MyTracks/res/drawable-mdpi/blue_pushpin.png
diff --git a/MyTracks/res/drawable/googledocs_icon.png b/MyTracks/res/drawable-mdpi/googledocs_icon.png
similarity index 100%
rename from MyTracks/res/drawable/googledocs_icon.png
rename to MyTracks/res/drawable-mdpi/googledocs_icon.png
diff --git a/MyTracks/res/drawable/green_dot.png b/MyTracks/res/drawable-mdpi/green_dot.png
similarity index 100%
rename from MyTracks/res/drawable/green_dot.png
rename to MyTracks/res/drawable-mdpi/green_dot.png
diff --git a/MyTracks/res/drawable/ic_menu_chartsettings.png b/MyTracks/res/drawable-mdpi/ic_menu_chartsettings.png
similarity index 100%
rename from MyTracks/res/drawable/ic_menu_chartsettings.png
rename to MyTracks/res/drawable-mdpi/ic_menu_chartsettings.png
diff --git a/MyTracks/res/drawable/ic_menu_recordtrack.png b/MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png
similarity index 100%
rename from MyTracks/res/drawable/ic_menu_recordtrack.png
rename to MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png
diff --git a/MyTracks/res/drawable/ic_menu_sensorstatus.png b/MyTracks/res/drawable-mdpi/ic_menu_sensorstatus.png
similarity index 100%
rename from MyTracks/res/drawable/ic_menu_sensorstatus.png
rename to MyTracks/res/drawable-mdpi/ic_menu_sensorstatus.png
diff --git a/MyTracks/res/drawable/ic_menu_statistics.png b/MyTracks/res/drawable-mdpi/ic_menu_statistics.png
similarity index 100%
rename from MyTracks/res/drawable/ic_menu_statistics.png
rename to MyTracks/res/drawable-mdpi/ic_menu_statistics.png
diff --git a/MyTracks/res/drawable/ic_menu_stoprecording.png b/MyTracks/res/drawable-mdpi/ic_menu_stoprecording.png
similarity index 100%
rename from MyTracks/res/drawable/ic_menu_stoprecording.png
rename to MyTracks/res/drawable-mdpi/ic_menu_stoprecording.png
diff --git a/MyTracks/res/drawable/ic_menu_tracklist.png b/MyTracks/res/drawable-mdpi/ic_menu_tracklist.png
similarity index 100%
rename from MyTracks/res/drawable/ic_menu_tracklist.png
rename to MyTracks/res/drawable-mdpi/ic_menu_tracklist.png
diff --git a/MyTracks/res/drawable/ic_menu_waypoints.png b/MyTracks/res/drawable-mdpi/ic_menu_waypoints.png
similarity index 100%
rename from MyTracks/res/drawable/ic_menu_waypoints.png
rename to MyTracks/res/drawable-mdpi/ic_menu_waypoints.png
diff --git a/MyTracks/res/drawable/left_arrow_chart.png b/MyTracks/res/drawable-mdpi/left_arrow_chart.png
similarity index 100%
rename from MyTracks/res/drawable/left_arrow_chart.png
rename to MyTracks/res/drawable-mdpi/left_arrow_chart.png
diff --git a/MyTracks/res/drawable/left_arrow_chart_press.png b/MyTracks/res/drawable-mdpi/left_arrow_chart_press.png
similarity index 100%
rename from MyTracks/res/drawable/left_arrow_chart_press.png
rename to MyTracks/res/drawable-mdpi/left_arrow_chart_press.png
diff --git a/MyTracks/res/drawable/left_arrow_stats.png b/MyTracks/res/drawable-mdpi/left_arrow_stats.png
similarity index 100%
rename from MyTracks/res/drawable/left_arrow_stats.png
rename to MyTracks/res/drawable-mdpi/left_arrow_stats.png
diff --git a/MyTracks/res/drawable/left_arrow_stats_press.png b/MyTracks/res/drawable-mdpi/left_arrow_stats_press.png
similarity index 100%
rename from MyTracks/res/drawable/left_arrow_stats_press.png
rename to MyTracks/res/drawable-mdpi/left_arrow_stats_press.png
diff --git a/MyTracks/res/drawable/left_arrow_track.png b/MyTracks/res/drawable-mdpi/left_arrow_track.png
similarity index 100%
rename from MyTracks/res/drawable/left_arrow_track.png
rename to MyTracks/res/drawable-mdpi/left_arrow_track.png
diff --git a/MyTracks/res/drawable/left_arrow_track_press.png b/MyTracks/res/drawable-mdpi/left_arrow_track_press.png
similarity index 100%
rename from MyTracks/res/drawable/left_arrow_track_press.png
rename to MyTracks/res/drawable-mdpi/left_arrow_track_press.png
diff --git a/MyTracks/res/drawable/maps_icon.png b/MyTracks/res/drawable-mdpi/maps_icon.png
similarity index 100%
rename from MyTracks/res/drawable/maps_icon.png
rename to MyTracks/res/drawable-mdpi/maps_icon.png
diff --git a/MyTracks/res/drawable/menu_elevation.png b/MyTracks/res/drawable-mdpi/menu_elevation.png
similarity index 100%
rename from MyTracks/res/drawable/menu_elevation.png
rename to MyTracks/res/drawable-mdpi/menu_elevation.png
diff --git a/MyTracks/res/drawable/red_dot.png b/MyTracks/res/drawable-mdpi/red_dot.png
similarity index 100%
rename from MyTracks/res/drawable/red_dot.png
rename to MyTracks/res/drawable-mdpi/red_dot.png
diff --git a/MyTracks/res/drawable/right_arrow_chart.png b/MyTracks/res/drawable-mdpi/right_arrow_chart.png
similarity index 100%
rename from MyTracks/res/drawable/right_arrow_chart.png
rename to MyTracks/res/drawable-mdpi/right_arrow_chart.png
diff --git a/MyTracks/res/drawable/right_arrow_chart_press.png b/MyTracks/res/drawable-mdpi/right_arrow_chart_press.png
similarity index 100%
rename from MyTracks/res/drawable/right_arrow_chart_press.png
rename to MyTracks/res/drawable-mdpi/right_arrow_chart_press.png
diff --git a/MyTracks/res/drawable/right_arrow_stats.png b/MyTracks/res/drawable-mdpi/right_arrow_stats.png
similarity index 100%
rename from MyTracks/res/drawable/right_arrow_stats.png
rename to MyTracks/res/drawable-mdpi/right_arrow_stats.png
diff --git a/MyTracks/res/drawable/right_arrow_stats_press.png b/MyTracks/res/drawable-mdpi/right_arrow_stats_press.png
similarity index 100%
rename from MyTracks/res/drawable/right_arrow_stats_press.png
rename to MyTracks/res/drawable-mdpi/right_arrow_stats_press.png
diff --git a/MyTracks/res/drawable/right_arrow_track.png b/MyTracks/res/drawable-mdpi/right_arrow_track.png
similarity index 100%
rename from MyTracks/res/drawable/right_arrow_track.png
rename to MyTracks/res/drawable-mdpi/right_arrow_track.png
diff --git a/MyTracks/res/drawable/right_arrow_track_press.png b/MyTracks/res/drawable-mdpi/right_arrow_track_press.png
similarity index 100%
rename from MyTracks/res/drawable/right_arrow_track_press.png
rename to MyTracks/res/drawable-mdpi/right_arrow_track_press.png
diff --git a/MyTracks/res/drawable/track.png b/MyTracks/res/drawable-mdpi/track.png
similarity index 100%
rename from MyTracks/res/drawable/track.png
rename to MyTracks/res/drawable-mdpi/track.png
diff --git a/MyTracks/res/drawable/x_axis.png b/MyTracks/res/drawable-mdpi/x_axis.png
similarity index 100%
rename from MyTracks/res/drawable/x_axis.png
rename to MyTracks/res/drawable-mdpi/x_axis.png
diff --git a/MyTracks/res/drawable/y_axis.png b/MyTracks/res/drawable-mdpi/y_axis.png
similarity index 100%
rename from MyTracks/res/drawable/y_axis.png
rename to MyTracks/res/drawable-mdpi/y_axis.png
diff --git a/MyTracks/res/drawable/ylw_pushpin.png b/MyTracks/res/drawable-mdpi/ylw_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable/ylw_pushpin.png
rename to MyTracks/res/drawable-mdpi/ylw_pushpin.png
diff --git a/MyTracks/res/drawable/arrow_grey.png b/MyTracks/res/drawable/arrow_grey.png
deleted file mode 100644
index 888037955..000000000
Binary files a/MyTracks/res/drawable/arrow_grey.png and /dev/null differ
diff --git a/MyTracks/res/drawable/chart_settings.png b/MyTracks/res/drawable/chart_settings.png
deleted file mode 100644
index 63147af45..000000000
Binary files a/MyTracks/res/drawable/chart_settings.png and /dev/null differ
diff --git a/MyTracks/res/drawable/ic_menu_lastsegment.png b/MyTracks/res/drawable/ic_menu_lastsegment.png
deleted file mode 100644
index ee9c085c8..000000000
Binary files a/MyTracks/res/drawable/ic_menu_lastsegment.png and /dev/null differ
diff --git a/MyTracks/res/drawable/ic_menu_pauserecording.png b/MyTracks/res/drawable/ic_menu_pauserecording.png
deleted file mode 100644
index 37cf534b1..000000000
Binary files a/MyTracks/res/drawable/ic_menu_pauserecording.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_by_distance.png b/MyTracks/res/drawable/menu_by_distance.png
deleted file mode 100644
index 386098e55..000000000
Binary files a/MyTracks/res/drawable/menu_by_distance.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_by_time.png b/MyTracks/res/drawable/menu_by_time.png
deleted file mode 100644
index a76e94d48..000000000
Binary files a/MyTracks/res/drawable/menu_by_time.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_list_tracks.png b/MyTracks/res/drawable/menu_list_tracks.png
deleted file mode 100644
index 4b46f0ab0..000000000
Binary files a/MyTracks/res/drawable/menu_list_tracks.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_marker.png b/MyTracks/res/drawable/menu_marker.png
deleted file mode 100644
index 6a8fdaf48..000000000
Binary files a/MyTracks/res/drawable/menu_marker.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_record.png b/MyTracks/res/drawable/menu_record.png
deleted file mode 100644
index ba590da8d..000000000
Binary files a/MyTracks/res/drawable/menu_record.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_sensor_status.png b/MyTracks/res/drawable/menu_sensor_status.png
deleted file mode 100644
index 80e68b847..000000000
Binary files a/MyTracks/res/drawable/menu_sensor_status.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_stats.png b/MyTracks/res/drawable/menu_stats.png
deleted file mode 100644
index 50f52c31b..000000000
Binary files a/MyTracks/res/drawable/menu_stats.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_stop.png b/MyTracks/res/drawable/menu_stop.png
deleted file mode 100644
index e62e796ee..000000000
Binary files a/MyTracks/res/drawable/menu_stop.png and /dev/null differ
diff --git a/MyTracks/res/layout/upload_service_chooser.xml b/MyTracks/res/layout/upload_service_chooser.xml
index ca750d794..c4cc68a35 100644
--- a/MyTracks/res/layout/upload_service_chooser.xml
+++ b/MyTracks/res/layout/upload_service_chooser.xml
@@ -14,93 +14,78 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
-  android:orientation="vertical">
-  <TextView
-    android:background="@drawable/list_bar"
+  android:layout_width="fill_parent" >
+  <TableLayout
     android:layout_height="wrap_content"
+    android:layout_margin="8dp"
     android:layout_width="fill_parent"
-    android:paddingLeft="10dp"
-    android:text="@string/send_google_title"
-    android:textColor="@color/white"
-    android:textSize="20sp"/>
-  <ScrollView
-    android:layout_height="0dp"
-    android:layout_margin="5dp"
-    android:layout_weight="1"
-    android:layout_width="fill_parent">
-    <TableLayout
-      android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
-      android:stretchColumns="1">
-
-      <!-- Google Maps -->
-      <TableRow android:id="@+id/send_google_maps_row">
-        <ImageView
-          android:contentDescription="@string/send_google_maps"
-          android:src="@drawable/maps_icon"
-          style="@style/SendGoogleImageView"/>
-        <CheckBox
-          android:id="@+id/send_google_maps"
-          android:text="@string/send_google_maps"
-          style="@style/SendGoogleCheckBox"/>
-      </TableRow>
-      <TableRow android:id="@+id/send_google_maps_option_row">
-        <RadioGroup
-          android:layout_column="1"
+    android:stretchColumns="1" >
+    <TableRow android:id="@+id/send_google_maps_row" >
+      <ImageView
+        android:contentDescription="@string/send_google_maps"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/maps_icon" />
+      <CheckBox
+        android:id="@+id/send_google_maps"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        android:text="@string/send_google_maps"
+        style="@android:style/TextAppearance.DeviceDefault.Medium" />
+    </TableRow>
+    <TableRow android:id="@+id/send_google_maps_option_row" >
+      <RadioGroup
+        android:layout_column="1"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp" >
+        <RadioButton
+          android:id="@+id/send_google_new_map"
           android:layout_height="wrap_content"
-          android:layout_marginLeft="10dp"
-          android:layout_width="0dp">
-          <RadioButton
-            android:id="@+id/send_google_new_map"
-            android:text="@string/send_google_new_map"
-            style="@style/SendGoogleRadioButton"/>
-          <RadioButton
-            android:id="@+id/send_google_existing_map"
-            android:text="@string/send_google_existing_map"
-            style="@style/SendGoogleRadioButton"/>
-        </RadioGroup>
-      </TableRow>
-
-      <!-- Google Fusion Tables -->
-      <TableRow android:id="@+id/send_google_fusion_tables_row">
-        <ImageView
-          android:contentDescription="@string/send_google_fusion_tables"
-          android:src="@drawable/googledocs_icon"
-          style="@style/SendGoogleImageView"/>
-        <CheckBox
-          android:id="@+id/send_google_fusion_tables"
-          android:text="@string/send_google_fusion_tables"
-          style="@style/SendGoogleCheckBox"/>
-      </TableRow>
-
-      <!-- Google Docs -->
-      <TableRow android:id="@+id/send_google_docs_row">
-        <ImageView
-          android:contentDescription="@string/send_google_docs"
-          android:src="@drawable/googledocs_icon"
-          style="@style/SendGoogleImageView"/>
-        <CheckBox
-          android:id="@+id/send_google_docs"
-          android:text="@string/send_google_docs"
-          style="@style/SendGoogleCheckBox"/>
-      </TableRow>
-    </TableLayout>
-  </ScrollView>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button
-      android:id="@+id/send_google_send_now"
-      android:layout_gravity="left"
-      android:text="@string/send_google_send_now"
-      style="@style/Button"/>
-    <Button
-      android:id="@+id/send_google_cancel"
-      android:layout_gravity="right"
-      android:text="@string/generic_cancel"
-      style="@style/Button"/>
-    <LinearLayout style="@style/ButtonSpacer"/>
-  </LinearLayout>
-</LinearLayout>
+          android:layout_width="wrap_content"
+          android:text="@string/send_google_new_map"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
+        <RadioButton
+          android:id="@+id/send_google_existing_map"
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content"
+          android:text="@string/send_google_existing_map"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
+      </RadioGroup>
+    </TableRow>
+    <TableRow android:id="@+id/send_google_fusion_tables_row" >
+      <ImageView
+        android:contentDescription="@string/send_google_fusion_tables"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/googledocs_icon" />
+      <CheckBox
+        android:id="@+id/send_google_fusion_tables"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        android:text="@string/send_google_fusion_tables"
+        style="@android:style/TextAppearance.DeviceDefault.Medium" />
+    </TableRow>
+    <TableRow android:id="@+id/send_google_docs_row" >
+      <ImageView
+        android:contentDescription="@string/send_google_docs"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/googledocs_icon" />
+      <CheckBox
+        android:id="@+id/send_google_docs"
+        android:layout_gravity="center_vertical"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        android:text="@string/send_google_docs"
+        style="@android:style/TextAppearance.DeviceDefault.Medium" />
+    </TableRow>
+  </TableLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/MyTracks/res/menu/main.xml b/MyTracks/res/menu/main.xml
index bbef87da1..76be5e18e 100644
--- a/MyTracks/res/menu/main.xml
+++ b/MyTracks/res/menu/main.xml
@@ -41,7 +41,7 @@ limitations under the License.
     android:title="@string/menu_markers"/>
 
   <item
-    android:icon="@drawable/chart_settings"
+    android:icon="@drawable/ic_menu_chartsettings"
     android:id="@+id/menu_chart_settings"
     android:showAsAction="ifRoom"
     android:title="@string/menu_chart_view_chart_settings"
diff --git a/MyTracks/res/menu/search_only.xml b/MyTracks/res/menu/search_only.xml
index ccf072255..44cd456e8 100644
--- a/MyTracks/res/menu/search_only.xml
+++ b/MyTracks/res/menu/search_only.xml
@@ -15,12 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
   <item
     android:icon="@android:drawable/ic_menu_search"
     android:id="@+id/menu_search"
-    android:onClick="onSearch"
     android:showAsAction="always"
     android:title="@string/menu_search"/>
-
 </menu>
\ No newline at end of file
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index ec8c509b1..f134b3799 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -1343,6 +1343,11 @@ limitations under the License.
       found.">
     No account found
   </string>
+  <string name="send_google_no_service_selected"
+    translation_description="When sending a track to Google, a message indicating that the user has
+      not selected any Google service and no data is sent.">
+    You did not select any service. The track was not sent.
+  </string>
   <string name="send_google_progress_title"
     translation_description="When sending a track to a Google service, the title on the progress
       dialog.
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index bf56cffd3..f488ad257 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -74,28 +74,6 @@ limitations under the License.
     <item name="android:visibility">gone</item>
   </style>
 
-  <!-- Send Google CheckBox -->
-  <style name="SendGoogleCheckBox">
-    <item name="android:checked">true</item>
-    <item name="android:layout_height">fill_parent</item>
-    <item name="android:layout_marginLeft">10dp</item>
-    <item name="android:layout_width">0dp</item>
-    <item name="android:textSize">18sp</item>
-  </style>
-
-  <!-- Send Google ImageView -->
-  <style name="SendGoogleImageView">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
-
-  <!-- Send Google RadioButton -->
-  <style name="SendGoogleRadioButton">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:textSize">18sp</item>
-  </style>
-
   <style name="SensorStateLabel">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">fill_parent</item>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java
index 8d47e1be3..b09845d2c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java
@@ -72,7 +72,7 @@ public class ImportActivity extends Activity {
     Intent intent = getIntent();
     importAll = intent.getBooleanExtra(EXTRA_IMPORT_ALL, false);
     if (importAll) {
-      path = new FileUtils().buildExternalDirectoryPath("gpx");
+      path = FileUtils.buildExternalDirectoryPath("gpx");
     } else {
       String action = intent.getAction();
       if (!(Intent.ACTION_ATTACH_DATA.equals(action) || Intent.ACTION_VIEW.equals(action))) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ImportAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/ImportAsyncTask.java
index 4e8898936..e5c82a2b4 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ImportAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ImportAsyncTask.java
@@ -121,8 +121,7 @@ public class ImportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
   @Override
   protected Boolean doInBackground(Void... params) {
     try {
-      FileUtils fileUtils = new FileUtils();
-      if (!fileUtils.isSdCardAvailable()) {
+      if (!FileUtils.isSdCardAvailable()) {
         return false;
       }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index 7b6e2584a..6dee92532 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -32,8 +32,8 @@ import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection
 import com.google.android.apps.mytracks.util.AnalyticsUtils;
 import com.google.android.apps.mytracks.util.ApiAdapterFactory;
 import com.google.android.apps.mytracks.util.EulaUtils;
-import com.google.android.apps.mytracks.util.SystemUtils;
 import com.google.android.apps.mytracks.util.UriUtils;
+import com.google.android.maps.mytracks.BuildConfig;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
@@ -73,7 +73,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
   private static final int DIALOG_CHECK_UNITS_ID = 1;
   private static final String CHECK_UNITS_PREFERENCE_FILE = "checkunits";
   private static final String CHECK_UNITS_PREFERENCE_KEY = "checkunits.checked";
-  
+
   private TrackDataHub dataHub;
 
   /**
@@ -140,7 +140,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
   protected void onCreate(Bundle savedInstanceState) {
     Log.d(TAG, "MyTracks.onCreate");
     super.onCreate(savedInstanceState);
-    if (!SystemUtils.isRelease(this)) {
+    if (BuildConfig.DEBUG) {
       ApiAdapterFactory.getApiAdapter().enableStrictMode();
     }
 
@@ -153,7 +153,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
     serviceConnection = new TrackRecordingServiceConnection(this, serviceBindCallback);
 
     setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
-    
+
     // Show the action bar (or nothing at all).
     ApiAdapterFactory.getApiAdapter().showActionBar(this);
 
@@ -167,7 +167,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
             android.R.drawable.ic_menu_mapmode))
         .setContent(new Intent(this, MapActivity.class)));
     tabHost.addTab(tabHost.newTabSpec(STATS_TAB_TAG)
-        .setIndicator("Stats", res.getDrawable(R.drawable.menu_stats))
+        .setIndicator("Stats", res.getDrawable(R.drawable.ic_menu_statistics))
         .setContent(new Intent(this, StatsActivity.class)));
     tabHost.addTab(tabHost.newTabSpec(CHART_TAB_TAG)
         .setIndicator("Chart", res.getDrawable(R.drawable.menu_elevation))
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
index e62f0b798..9e2765a6e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
@@ -324,6 +324,17 @@ public class TrackList extends ListActivity
     getMenuInflater().inflate(R.menu.search_only, menu);
     return true;
   }
+  
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+      case R.id.menu_search:
+        onSearchRequested();
+        return true;
+      default:
+        return super.onOptionsItemSelected(item);
+    }
+  }
 
   @Override
   protected Dialog onCreateDialog(int id) {
@@ -387,11 +398,6 @@ public class TrackList extends ListActivity
     }
   }
 
-  /* Callback from menu/search_only.xml */
-  public void onSearch(@SuppressWarnings("unused") MenuItem i) {
-    onSearchRequested();
-  }
-
   private void updateButtonsEnabled() {
     View deleteAll = findViewById(R.id.tracklist_btn_delete_all);
     View exportAll = findViewById(R.id.tracklist_btn_export_all);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
index 135caffc5..bc224f3c3 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
@@ -224,10 +224,16 @@ public class WaypointsList extends ListActivity implements View.OnClickListener
     getMenuInflater().inflate(R.menu.search_only, menu);
     return true;
   }
-
-  /* Callback from menu/search_only.xml */
-  public void onSearch(@SuppressWarnings("unused") MenuItem i) {
-    onSearchRequested();
+  
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+      case R.id.menu_search:
+        onSearchRequested();
+        return true;
+      default:
+        return super.onOptionsItemSelected(item);
+    }
   }
 
   @Override
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupAsyncTask.java
index 3ef19ad31..fd0675640 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupAsyncTask.java
@@ -53,7 +53,7 @@ public class BackupAsyncTask extends AsyncTask<Void, Integer, Boolean> {
    */
   public BackupAsyncTask(BackupActivity backupActivity) {
     this.backupActivity = backupActivity;
-    this.externalFileBackup = new ExternalFileBackup(backupActivity, new FileUtils());
+    this.externalFileBackup = new ExternalFileBackup(backupActivity);
     success = false;
     completed = false;
     messageId = R.string.sd_card_error_write_file;
@@ -80,9 +80,7 @@ public class BackupAsyncTask extends AsyncTask<Void, Integer, Boolean> {
 
   @Override
   protected Boolean doInBackground(Void... params) {
-    FileUtils fileUtils = new FileUtils();
-
-    if (!fileUtils.isSdCardAvailable()) {
+    if (!FileUtils.isSdCardAvailable()) {
       messageId = R.string.sd_card_error_no_storage;
       return false;
     }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
index 68a0aea09..7fe2b3c2b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
@@ -65,11 +65,9 @@ class ExternalFileBackup {
   private static final int COMPRESSION_LEVEL = 8;
 
   private final Context context;
-  private final FileUtils fileUtils;
 
-  public ExternalFileBackup(Context context, FileUtils fileUtils) {
+  public ExternalFileBackup(Context context) {
     this.context = context;
-    this.fileUtils = fileUtils;
   }
 
   /**
@@ -87,12 +85,12 @@ class ExternalFileBackup {
    * @param create whether to try creating the directory if it doesn't exist
    */
   private File getBackupsDirectory(boolean create) {
-    String dirName = fileUtils.buildExternalDirectoryPath(BACKUPS_SUBDIR);
+    String dirName = FileUtils.buildExternalDirectoryPath(BACKUPS_SUBDIR);
     final File dir = new File(dirName);
     Log.d(Constants.TAG, "Dir: " + dir.getAbsolutePath());
     if (create) {
       // Try to create - if that fails, return null
-      return fileUtils.ensureDirectoryExists(dir) ? dir : null;
+      return FileUtils.ensureDirectoryExists(dir) ? dir : null;
     } else {
       // Return it if it already exists, otherwise return null
       return dir.isDirectory() ? dir : null;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java
index 23917d521..009c0d44f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java
@@ -16,7 +16,6 @@
 
 package com.google.android.apps.mytracks.io.backup;
 
-import com.google.android.apps.mytracks.util.FileUtils;
 import com.google.android.maps.mytracks.R;
 
 import android.os.AsyncTask;
@@ -57,7 +56,7 @@ public class RestoreAsyncTask extends AsyncTask<Void, Integer, Boolean> {
   public RestoreAsyncTask(RestoreActivity restoreActivity, Date date) {
     this.restoreActivity = restoreActivity;
     this.date = date;
-    this.externalFileBackup = new ExternalFileBackup(restoreActivity, new FileUtils());
+    this.externalFileBackup = new ExternalFileBackup(restoreActivity);
     success = false;
     completed = false;
     messageId = R.string.sd_card_error_read_file;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
index 8b5fc81c7..433497147 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
@@ -55,11 +55,10 @@ public class RestoreChooserActivity extends Activity {
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
-    FileUtils fileUtils = new FileUtils();
-    ExternalFileBackup externalFileBackup = new ExternalFileBackup(this, fileUtils);
+    ExternalFileBackup externalFileBackup = new ExternalFileBackup(this);
 
     // Get the list of existing backups
-    if (!fileUtils.isSdCardAvailable()) {
+    if (!FileUtils.isSdCardAvailable()) {
       Toast.makeText(this, R.string.sd_card_error_no_storage, Toast.LENGTH_LONG).show();
       finish();
       return;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
index 8ecbfb596..e3b4a9716 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
@@ -101,7 +101,7 @@ public class SaveActivity extends Activity {
       }
       if (shareTrack || playTrack) {
         // Save to the temp directory
-        String dirName = new FileUtils().buildExternalDirectoryPath(
+        String dirName = FileUtils.buildExternalDirectoryPath(
             trackFileFormat.getExtension(), "tmp");
         trackWriter.setDirectory(new File(dirName));
       }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
index 76517544b..977ea8692 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
@@ -52,7 +52,6 @@ class TrackWriterImpl implements TrackWriter {
   private final MyTracksProviderUtils providerUtils;
   private final Track track;
   private final TrackFormatWriter writer;
-  private final FileUtils fileUtils;
   private boolean success = false;
   private int errorMessage = -1;
   private File directory = null;
@@ -66,7 +65,6 @@ class TrackWriterImpl implements TrackWriter {
     this.providerUtils = providerUtils;
     this.track = track;
     this.writer = writer;
-    this.fileUtils = new FileUtils();
   }
 
   @Override
@@ -175,7 +173,7 @@ class TrackWriterImpl implements TrackWriter {
     }
 
     // Make sure the file doesn't exist yet (possibly by changing the filename)
-    String fileName = fileUtils.buildUniqueFileName(
+    String fileName = FileUtils.buildUniqueFileName(
         directory, track.getName(), writer.getExtension());
     if (fileName == null) {
       Log.e(Constants.TAG,
@@ -200,16 +198,16 @@ class TrackWriterImpl implements TrackWriter {
   protected boolean canWriteFile() {
     if (directory == null) {
       String dirName =
-          fileUtils.buildExternalDirectoryPath(writer.getExtension());
+          FileUtils.buildExternalDirectoryPath(writer.getExtension());
       directory = newFile(dirName);
     }
 
-    if (!fileUtils.isSdCardAvailable()) {
+    if (!FileUtils.isSdCardAvailable()) {
       Log.i(Constants.TAG, "Could not find SD card.");
       errorMessage = R.string.sd_card_error_no_storage;
       return false;
     }
-    if (!fileUtils.ensureDirectoryExists(directory)) {
+    if (!FileUtils.ensureDirectoryExists(directory)) {
       Log.i(Constants.TAG, "Could not create export directory.");
       errorMessage = R.string.sd_card_error_create_dir;
       return false;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
index 5a18b927b..c2703b016 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
@@ -22,6 +22,7 @@ import com.google.android.maps.mytracks.R;
 import com.google.common.annotations.VisibleForTesting;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -30,27 +31,26 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.os.Bundle;
 import android.view.View;
-import android.view.Window;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.RadioButton;
 import android.widget.TableRow;
+import android.widget.Toast;
 
 import java.util.ArrayList;
 
 /**
  * A chooser to select the Google services to upload a track to.
- *
+ * 
  * @author Jimmy Shih
  */
 public class UploadServiceChooserActivity extends Activity {
 
-  private static final int SERVICE_PICKER_DIALOG = 1;
+  private static final int DIALOG_CHOOSER_ID = 0;
 
   private SendRequest sendRequest;
-  private Dialog dialog;
+  private AlertDialog alertDialog;
 
   private TableRow mapsTableRow;
   private TableRow fusionTablesTableRow;
@@ -64,9 +64,6 @@ public class UploadServiceChooserActivity extends Activity {
   private RadioButton newMapRadioButton;
   private RadioButton existingMapRadioButton;
 
-  private Button cancel;
-  private Button send;
-
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
@@ -76,74 +73,78 @@ public class UploadServiceChooserActivity extends Activity {
   @Override
   protected void onResume() {
     super.onResume();
-    showDialog(SERVICE_PICKER_DIALOG);
+    showDialog(DIALOG_CHOOSER_ID);
   }
 
   @Override
   protected Dialog onCreateDialog(int id) {
-    switch (id) {
-      case SERVICE_PICKER_DIALOG:
-        dialog = new Dialog(this);
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(R.layout.upload_service_chooser);
-        dialog.setCancelable(true);
-        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+    if (id != DIALOG_CHOOSER_ID) {
+      return null;
+    }
+    View view = getLayoutInflater().inflate(R.layout.upload_service_chooser, null);
+
+    mapsTableRow = (TableRow) view.findViewById(R.id.send_google_maps_row);
+    fusionTablesTableRow = (TableRow) view.findViewById(R.id.send_google_fusion_tables_row);
+    docsTableRow = (TableRow) view.findViewById(R.id.send_google_docs_row);
+
+    mapsCheckBox = (CheckBox) view.findViewById(R.id.send_google_maps);
+    fusionTablesCheckBox = (CheckBox) view.findViewById(R.id.send_google_fusion_tables);
+    docsCheckBox = (CheckBox) view.findViewById(R.id.send_google_docs);
+
+    mapsOptionTableRow = (TableRow) view.findViewById(R.id.send_google_maps_option_row);
+    newMapRadioButton = (RadioButton) view.findViewById(R.id.send_google_new_map);
+    existingMapRadioButton = (RadioButton) view.findViewById(R.id.send_google_existing_map);
+
+    // Setup checkboxes
+    OnCheckedChangeListener checkBoxListener = new OnCheckedChangeListener() {
+      public void onCheckedChanged(CompoundButton button, boolean checked) {
+        updateStateBySelection();
+      }
+    };
+    mapsCheckBox.setOnCheckedChangeListener(checkBoxListener);
+    fusionTablesCheckBox.setOnCheckedChangeListener(checkBoxListener);
+    docsCheckBox.setOnCheckedChangeListener(checkBoxListener);
+
+    // Setup initial state
+    initState();
+
+    // Update state based on sendRequest
+    updateStateBySendRequest();
+
+    // Update state based on current selection
+    updateStateBySelection();
+
+    alertDialog = new AlertDialog.Builder(this)
+        .setCancelable(true)
+        .setNegativeButton(R.string.generic_cancel, new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            finish();
+          }
+        })
+        .setOnCancelListener(new DialogInterface.OnCancelListener() {
           @Override
           public void onCancel(DialogInterface d) {
             finish();
           }
-        });
-
-        mapsTableRow = (TableRow) dialog.findViewById(R.id.send_google_maps_row);
-        fusionTablesTableRow = (TableRow) dialog.findViewById(R.id.send_google_fusion_tables_row);
-        docsTableRow = (TableRow) dialog.findViewById(R.id.send_google_docs_row);
-
-        mapsCheckBox = (CheckBox) dialog.findViewById(R.id.send_google_maps);
-        fusionTablesCheckBox = (CheckBox) dialog.findViewById(R.id.send_google_fusion_tables);
-        docsCheckBox = (CheckBox) dialog.findViewById(R.id.send_google_docs);
-
-        mapsOptionTableRow = (TableRow) dialog.findViewById(R.id.send_google_maps_option_row);
-        newMapRadioButton = (RadioButton) dialog.findViewById(R.id.send_google_new_map);
-        existingMapRadioButton = (RadioButton) dialog.findViewById(R.id.send_google_existing_map);
-
-        // Setup checkboxes
-        OnCheckedChangeListener checkBoxListener = new OnCheckedChangeListener() {
-          public void onCheckedChanged(CompoundButton button, boolean checked) {
-            updateStateBySelection();
-          }
-        };
-        mapsCheckBox.setOnCheckedChangeListener(checkBoxListener);
-        fusionTablesCheckBox.setOnCheckedChangeListener(checkBoxListener);
-        docsCheckBox.setOnCheckedChangeListener(checkBoxListener);
-
-        // Setup buttons
-        cancel = (Button) dialog.findViewById(R.id.send_google_cancel);
-        cancel.setOnClickListener(new View.OnClickListener() {
-          public void onClick(View v) {
-            finish();
-          }
-        });
-        send = (Button) dialog.findViewById(R.id.send_google_send_now);
-        send.setOnClickListener(new View.OnClickListener() {
-          public void onClick(View v) {
+        })
+        .setPositiveButton(R.string.send_google_send_now, new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
             saveState();
-            startNextActivity();
+            if (sendMaps() || sendFusionTables() || sendDocs()) {
+              startNextActivity();
+            } else {
+              Toast.makeText(UploadServiceChooserActivity.this,
+                  R.string.send_google_no_service_selected, Toast.LENGTH_LONG).show();
+              finish();
+            }
           }
-        });
-
-        // Setup initial state
-        initState();
-
-        // Update state based on sendRequest
-        updateStateBySendRequest();
-
-        // Update state based on current user selection
-        updateStateBySelection();
-
-        return dialog;
-      default:
-        return null;
-    }
+        })
+        .setTitle(R.string.send_google_title)
+        .setView(view)
+        .create();
+    return alertDialog;
   }
 
   /**
@@ -186,7 +187,6 @@ public class UploadServiceChooserActivity extends Activity {
    */
   private void updateStateBySelection() {
     mapsOptionTableRow.setVisibility(sendMaps() ? View.VISIBLE : View.GONE);
-    send.setEnabled(sendMaps() || sendFusionTables() || sendDocs());
   }
 
   /**
@@ -242,7 +242,7 @@ public class UploadServiceChooserActivity extends Activity {
     startActivity(intent);
     finish();
   }
-  
+
   /**
    * Sends stats to Google Analytics.
    */
@@ -259,12 +259,12 @@ public class UploadServiceChooserActivity extends Activity {
     }
     AnalyticsUtils.sendPageViews(this, pages.toArray(new String[pages.size()]));
   }
-  
+
   @VisibleForTesting
-  Dialog getDialog() {
-    return dialog;
+  AlertDialog getAlertDialog() {
+    return alertDialog;
   }
-  
+
   @VisibleForTesting
   SendRequest getSendRequest() {
     return sendRequest;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java b/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java
index 0a36b2e66..9866aca3f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java
@@ -91,10 +91,7 @@ public class RemoveTempFilesService extends Service {
   }
 
   private void cleanTempDirectory(String name) {
-    FileUtils fileUtils = new FileUtils();
-    String dirName = fileUtils.buildExternalDirectoryPath(name, "tmp");
-    File dir = new File(dirName);
-    cleanTempDirectory(dir);
+    cleanTempDirectory(new File(FileUtils.buildExternalDirectoryPath(name, "tmp")));
   }
   
   /**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java
index f646ab1cd..58bfb95a2 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.services;
 import static com.google.android.apps.mytracks.Constants.TAG;
 
 import com.google.android.apps.mytracks.util.SystemUtils;
+import com.google.android.maps.mytracks.BuildConfig;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -157,7 +158,7 @@ public class TrackRecordingServiceConnection {
 
     Log.i(TAG, "Binding to the service");
     Intent intent = new Intent(context, TrackRecordingService.class);
-    int flags = SystemUtils.isRelease(context) ? 0 : Context.BIND_DEBUG_UNBIND;
+    int flags = BuildConfig.DEBUG ? Context.BIND_DEBUG_UNBIND : 0;
     context.bindService(intent, serviceConnection, flags);
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java
index 1006e4a6b..2a16fb743 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java
@@ -23,7 +23,7 @@ import com.dsi.ant.exception.AntInterfaceException;
 import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.Sensor;
 import com.google.android.apps.mytracks.util.ApiAdapterFactory;
-import com.google.android.apps.mytracks.util.SystemUtils;
+import com.google.android.maps.mytracks.BuildConfig;
 import com.google.android.maps.mytracks.R;
 
 import android.content.Context;
@@ -32,7 +32,7 @@ import android.util.Log;
 
 /**
  * A sensor manager to the PC7 SRM ANT+ bridge.
- * 
+ *
  * @author Sandor Dornbush
  * @author Umran Abdulla
  */
@@ -54,15 +54,15 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
   private static final int INDEX_MESSAGE_SPEED = 5;
   private static final int INDEX_MESSAGE_CADENCE = 7;
   private static final int INDEX_MESSAGE_BPM = 8;
-  
+
   private static final int MSG_INITIAL = 5;
   private static final int MSG_DATA = 6;
-  
+
   private short deviceNumber;
 
   public AntSrmBridgeSensorManager(Context context) {
     super(context);
-    
+
     Log.i(TAG, "new ANT SRM Bridge Sensor Manager created");
 
     deviceNumber = WILDCARD;
@@ -77,15 +77,15 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
     }
     Log.i(TAG, "Will pair with device: " + deviceNumber);
   }
-  
-  
+
+
   @Override
   protected boolean handleMessage(byte messageId, byte[] messageData) {
     if (super.handleMessage(messageId, messageData)) {
       return true;
     }
-    
-    if (!SystemUtils.isRelease(context)) {
+
+    if (BuildConfig.DEBUG) {
       Log.d(TAG, "Received ANT msg: " + AntUtils.antMessageToString(messageId) + "(" + messageId + ")");
     }
 
@@ -100,7 +100,7 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
 
     return true;
   }
-  
+
   /**
    * Decode an ant device message.
    * @param messageData The byte array received from the device.
@@ -132,10 +132,10 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
     }
 
     setSensorState(Sensor.SensorState.CONNECTED);
-    
+
     int messageType = antMessage[INDEX_MESSAGE_TYPE] & 0xFF;
     Log.d(TAG, "Received message-type=" + messageType);
-    
+
     switch (messageType) {
       case MSG_INITIAL:
           break;
@@ -149,7 +149,7 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
   {
       int messageId = msg[INDEX_MESSAGE_ID] & 0xFF;
       Log.d(TAG, "Received message-id=" + messageId);
-      
+
       int powerVal = (((msg[INDEX_MESSAGE_POWER] & 0xFF) << 8) |
           (msg[INDEX_MESSAGE_POWER+1] & 0xFF));
       @SuppressWarnings("unused")
@@ -158,12 +158,12 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
       int cadenceVal = (msg[INDEX_MESSAGE_CADENCE] & 0xFF);
       int bpmVal = (msg[INDEX_MESSAGE_BPM] & 0xFF);
       long time = System.currentTimeMillis();
-      
-      Sensor.SensorData.Builder power = 
+
+      Sensor.SensorData.Builder power =
         Sensor.SensorData.newBuilder()
             .setValue(powerVal)
             .setState(Sensor.SensorState.SENDING);
-    
+
       /*
        * Although speed is available from the SRM Bridge, MyTracks doesn't use the value, and
        * computes speed from the GPS location data.
@@ -171,12 +171,12 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
 //    Sensor.SensorData.Builder speed = Sensor.SensorData.newBuilder().setValue(speedVal).setState(
 //        Sensor.SensorState.SENDING);
 
-      Sensor.SensorData.Builder cadence = 
+      Sensor.SensorData.Builder cadence =
         Sensor.SensorData.newBuilder()
             .setValue(cadenceVal)
             .setState(Sensor.SensorState.SENDING);
 
-      Sensor.SensorData.Builder bpm = 
+      Sensor.SensorData.Builder bpm =
         Sensor.SensorData.newBuilder()
             .setValue(bpmVal)
             .setState(Sensor.SensorState.SENDING);
@@ -189,7 +189,7 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
             .setHeartRate(bpm)
             .build();
   }
-  
+
   void handleChannelId(byte[] rawMessage) {
     AntChannelIdMessage message = new AntChannelIdMessage(rawMessage);
     deviceNumber = message.getDeviceNumber();
@@ -203,12 +203,12 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
   }
 
   private void handleMessageResponse(byte[] rawMessage) {
-    AntChannelResponseMessage message = 
+    AntChannelResponseMessage message =
         new AntChannelResponseMessage(rawMessage);
-    if (!SystemUtils.isRelease(context)) {
+    if (BuildConfig.DEBUG) {
       Log.d(TAG, "Received ANT Response: " + AntUtils.antMessageToString(message.getMessageId()) +
           "(" + message.getMessageId() + ")" +
-          ", Code: " + AntUtils.antEventToStr(message.getMessageCode()) + 
+          ", Code: " + AntUtils.antEventToStr(message.getMessageCode()) +
           "(" + message.getMessageCode() + ")");
     }
     switch (message.getMessageId()) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
index 99ce45838..11d7ff5da 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
@@ -29,20 +29,46 @@ import java.io.File;
  */
 public class FileUtils {
 
+  private FileUtils() {}
+
   /**
    * The maximum FAT32 path length. See the FAT32 spec at
    * http://msdn.microsoft.com/en-us/windows/hardware/gg463080
    */
   @VisibleForTesting
   static final int MAX_FAT32_PATH_LENGTH = 260;
-  
+
+  /**
+   * Returns whether the SD card is available.
+   */
+  public static boolean isSdCardAvailable() {
+    return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
+  }
+
+  /**
+   * Ensures the given directory exists by creating it and its parents if
+   * necessary.
+   *
+   * @return whether the directory exists (either already existed or was
+   *         successfully created)
+   */
+  public static boolean ensureDirectoryExists(File dir) {
+    if (dir.exists() && dir.isDirectory()) {
+      return true;
+    }
+    if (dir.mkdirs()) {
+      return true;
+    }
+    return false;
+  }
+
   /**
    * Builds a path inside the My Tracks directory in the SD card.
    *
    * @param components the path components inside the mytracks directory
    * @return the full path to the destination
    */
-  public String buildExternalDirectoryPath(String... components) {
+  public static String buildExternalDirectoryPath(String... components) {
     StringBuilder dirNameBuilder = new StringBuilder();
     dirNameBuilder.append(Environment.getExternalStorageDirectory());
     dirNameBuilder.append(File.separatorChar);
@@ -54,33 +80,6 @@ public class FileUtils {
     return dirNameBuilder.toString();
   }
 
-  /**
-   * Returns whether the SD card is available.
-   */
-  public boolean isSdCardAvailable() {
-    return Environment.MEDIA_MOUNTED.equals(
-        Environment.getExternalStorageState());
-  }
-
-  /**
-   * Ensures the given directory exists by creating it and its parents if
-   * necessary.
-   * 
-   * @return whether the directory exists (either already existed or was
-   *         successfully created)
-   */
-  public boolean ensureDirectoryExists(File dir) {
-    if (dir.exists() && dir.isDirectory()) {
-      return true;
-    }
-
-    if (dir.mkdirs()) {
-      return true;
-    }
-
-    return false;
-  }
-
   /**
    * Builds a filename with the given base name (prefix) and the given
    * extension, possibly adding a suffix to ensure the file doesn't exist.
@@ -90,8 +89,8 @@ public class FileUtils {
    * @param extension the file's extension
    * @return the complete file name, without the directory
    */
-  public synchronized String buildUniqueFileName(File directory,
-      String fileBaseName, String extension) {
+  public static synchronized String buildUniqueFileName(
+      File directory, String fileBaseName, String extension) {
     return buildUniqueFileName(directory, fileBaseName, extension, 0);
   }
 
@@ -105,7 +104,8 @@ public class FileUtils {
    * @param suffix the first numeric suffix to try to use, or 0 for none
    * @return the complete filename, without the directory
    */
-  private String buildUniqueFileName(File directory, String base, String extension, int suffix) {
+  private static String buildUniqueFileName(
+      File directory, String base, String extension, int suffix) {
     String suffixName = "";
     if (suffix > 0) {
       suffixName += "(" + Integer.toString(suffix) + ")";
@@ -115,8 +115,8 @@ public class FileUtils {
     String baseName = sanitizeFileName(base);
     baseName = truncateFileName(directory, baseName, suffixName);
     String fullName = baseName + suffixName;
-    
-    if (!fileExists(directory, fullName)) {
+
+    if (!new File(directory, fullName).exists()) {
       return fullName;
     }
     return buildUniqueFileName(directory, base, extension, suffix + 1);
@@ -131,7 +131,7 @@ public class FileUtils {
    * @param name name
    */
   @VisibleForTesting
-  String sanitizeFileName(String name) {
+  static String sanitizeFileName(String name) {
     StringBuffer buffer = new StringBuffer(name.length());
     for (int i = 0; i < name.length(); i++) {
       int codePoint = name.codePointAt(i);
@@ -145,13 +145,13 @@ public class FileUtils {
     String result = buffer.toString();
     return result.replaceAll("_+", "_");
   }
-  
+
   /**
    * Returns true if it is a special FAT32 character.
-   * 
+   *
    * @param character the character
    */
-  private boolean isSpecialFat32(char character) {
+  private static boolean isSpecialFat32(char character) {
     switch (character) {
       case '$':
       case '%':
@@ -191,8 +191,8 @@ public class FileUtils {
    * @param suffix suffix
    */
   @VisibleForTesting
-  String truncateFileName(File directory, String name, String suffix) {
-    // 1 at the end accounts for the FAT32 filename trailing NUL character 
+  static String truncateFileName(File directory, String name, String suffix) {
+    // 1 at the end accounts for the FAT32 filename trailing NUL character
     int requiredLength = directory.getPath().length() + suffix.length() + 1;
     if (name.length() + requiredLength > MAX_FAT32_PATH_LENGTH) {
       int limit = MAX_FAT32_PATH_LENGTH - requiredLength;
@@ -201,13 +201,4 @@ public class FileUtils {
       return name;
     }
   }
-
-  /**
-   * Checks whether a file with the given name exists in the given directory.
-   * This is isolated so it can be overridden in tests.
-   */
-  protected boolean fileExists(File directory, String fullName) {
-    File file = new File(directory, fullName);
-    return file.exists();
-  }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/SystemUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/SystemUtils.java
index c45c88308..b0dc284d6 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/SystemUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/SystemUtils.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2011 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,6 @@ import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.Signature;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
@@ -34,26 +33,6 @@ import android.util.Log;
  */
 public class SystemUtils {
 
-  private static final int RELEASE_SIGNATURE_HASHCODE = -1855564782;
-
-  /**
-   * Returns whether or not this is a release build.
-   */
-  public static boolean isRelease(Context context) {
-    try {
-      Signature [] sigs = context.getPackageManager().getPackageInfo(
-          context.getPackageName(), PackageManager.GET_SIGNATURES).signatures;
-      for (Signature sig : sigs) {
-        if (sig.hashCode() == RELEASE_SIGNATURE_HASHCODE) {
-          return true;
-        }
-      }
-    } catch (NameNotFoundException e) {
-      Log.e(Constants.TAG, "Unable to get signatures", e);
-    }
-    return false;
-  }
-
   /**
    * Get the My Tracks version from the manifest.
    *
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java
index 50f5dd020..a4ca0b177 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java
@@ -24,7 +24,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.test.ActivityInstrumentationTestCase2;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.RadioButton;
 
@@ -59,7 +58,6 @@ public class UploadServiceChooserActivityTest extends
     assertTrue(getMapsCheckBox().isShown());
     assertTrue(getFusionTablesCheckBox().isShown());
     assertTrue(getDocsCheckBox().isShown());
-    assertTrue(getCancelButton().isEnabled());
 
     // Clicks to disable all send items.
     uploadServiceChooserActivity.runOnUiThread(new Runnable() {
@@ -79,11 +77,9 @@ public class UploadServiceChooserActivityTest extends
     assertTrue(getMapsCheckBox().isShown());
     assertTrue(getFusionTablesCheckBox().isShown());
     assertTrue(getDocsCheckBox().isShown());
-    assertTrue(getCancelButton().isEnabled());
 
     assertFalse(getNewMapRadioButton().isShown());
     assertFalse(getExistingMapRadioButton().isShown());
-    assertFalse(getSendButton().isEnabled());
   }
 
   /**
@@ -94,7 +90,6 @@ public class UploadServiceChooserActivityTest extends
     initialActivity(true, false, false);
     instrumentation.waitForIdleSync();
     assertTrue(getMapsCheckBox().isShown());
-    assertTrue(getCancelButton().isEnabled());
 
     // Clicks to enable this items.
     uploadServiceChooserActivity.runOnUiThread(new Runnable() {
@@ -108,8 +103,6 @@ public class UploadServiceChooserActivityTest extends
     assertTrue(getMapsCheckBox().isShown());
     assertTrue(getNewMapRadioButton().isShown());
     assertTrue(getExistingMapRadioButton().isShown());
-    assertTrue(getSendButton().isEnabled());
-    assertTrue(getCancelButton().isEnabled());
   }
 
   /**
@@ -120,8 +113,6 @@ public class UploadServiceChooserActivityTest extends
     assertFalse(getMapsCheckBox().isShown());
     assertFalse(getFusionTablesCheckBox().isShown());
     assertFalse(getDocsCheckBox().isShown());
-    assertFalse(getSendButton().isEnabled());
-    assertTrue(getCancelButton().isEnabled());
   }
 
   /**
@@ -259,35 +250,26 @@ public class UploadServiceChooserActivityTest extends
     uploadServiceChooserActivity = this.getActivity();
   }
 
-  private Button getSendButton() {
-    return (Button) uploadServiceChooserActivity.getDialog()
-        .findViewById(R.id.send_google_send_now);
-  }
-
-  Button getCancelButton() {
-    return (Button) uploadServiceChooserActivity.getDialog().findViewById(R.id.send_google_cancel);
-  }
-
   private CheckBox getMapsCheckBox() {
-    return (CheckBox) uploadServiceChooserActivity.getDialog().findViewById(R.id.send_google_maps);
+    return (CheckBox) uploadServiceChooserActivity.getAlertDialog().findViewById(R.id.send_google_maps);
   }
 
   private CheckBox getFusionTablesCheckBox() {
-    return (CheckBox) uploadServiceChooserActivity.getDialog().findViewById(
+    return (CheckBox) uploadServiceChooserActivity.getAlertDialog().findViewById(
         R.id.send_google_fusion_tables);
   }
 
   private CheckBox getDocsCheckBox() {
-    return (CheckBox) uploadServiceChooserActivity.getDialog().findViewById(R.id.send_google_docs);
+    return (CheckBox) uploadServiceChooserActivity.getAlertDialog().findViewById(R.id.send_google_docs);
   }
 
   private RadioButton getNewMapRadioButton() {
-    return (RadioButton) uploadServiceChooserActivity.getDialog().findViewById(
+    return (RadioButton) uploadServiceChooserActivity.getAlertDialog().findViewById(
         R.id.send_google_new_map);
   }
 
   private RadioButton getExistingMapRadioButton() {
-    return (RadioButton) uploadServiceChooserActivity.getDialog().findViewById(
+    return (RadioButton) uploadServiceChooserActivity.getAlertDialog().findViewById(
         R.id.send_google_existing_map);
   }
 }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java
index 8adda2946..12152c3c7 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java
@@ -20,8 +20,6 @@ import com.google.android.apps.mytracks.Constants;
 import android.os.Environment;
 
 import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
 
 import junit.framework.TestCase;
 
@@ -31,76 +29,81 @@ import junit.framework.TestCase;
  * @author Rodrigo Damazio
  */
 public class FileUtilsTest extends TestCase {
-  private FileUtils fileUtils;
-  private Set<String> existingFiles;
-
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-
-    existingFiles = new HashSet<String>();
-    fileUtils = new FileUtils() {
-      @Override
-      protected boolean fileExists(File directory, String fullName) {
-        return existingFiles.contains(fullName);
-      }
-    };
-  }
 
+  /**
+   * Tests {@link FileUtils#buildExternalDirectoryPath(String...)}.
+   */
   public void testBuildExternalDirectoryPath() {
-    String expectedName = Environment.getExternalStorageDirectory()
-        + File.separator
-        + Constants.SDCARD_TOP_DIR
-        + File.separator
-        + "a"
-        + File.separator
-        + "b"
-        + File.separator
+    String expectedName = Environment.getExternalStorageDirectory() + File.separator
+        + Constants.SDCARD_TOP_DIR + File.separator + "a" + File.separator + "b" + File.separator
         + "c";
-
-    String dirName = fileUtils.buildExternalDirectoryPath("a", "b", "c");
+    String dirName = FileUtils.buildExternalDirectoryPath("a", "b", "c");
     assertEquals(expectedName, dirName);
   }
 
   /**
-   * Tests sanitize filename.
+   * Tests {@link FileUtils#buildUniqueFileName(File, String, String)} when the
+   * file is new.
+   */
+  public void testBuildUniqueFileName_new() {
+    String filename = FileUtils.buildUniqueFileName(new File("/dir"), "Filename", "ext");
+    assertEquals("Filename.ext", filename);
+  }
+
+  /**
+   * Tests {@link FileUtils#buildUniqueFileName(File, String, String)} when the
+   * file exists already.
+   */
+  public void testBuildUniqueFileName_exist() {
+    // Expect "/default.prop" to exist on the phone/emulator
+    String filename = FileUtils.buildUniqueFileName(new File("/"), "default", "prop");
+    assertEquals("default(1).prop", filename);
+  }
+
+  /**
+   * Tests {@link FileUtils#sanitizeFileName(String)} with special characters.
+   * Verifies that they are sanitized.
    */
   public void testSanitizeFileName() {
     String name = "Swim\10ming-^across:/the/ pacific (ocean).";
     String expected = "Swim_ming-^across_the_ pacific (ocean)_";
-    assertEquals(expected, fileUtils.sanitizeFileName(name));
+    assertEquals(expected, FileUtils.sanitizeFileName(name));
   }
 
   /**
-   * Tests characters in other languages, like Chinese and Russian, are allowed.
+   * Tests {@link FileUtils#sanitizeFileName(String)} with i18n characters (in
+   * Chinese and Russian). Verifies that they are allowed.
    */
   public void testSanitizeFileName_i18n() {
     String name = "您好-привет";
     String expected = "您好-привет";
-    
-    assertEquals(expected, fileUtils.sanitizeFileName(name));
+    assertEquals(expected, FileUtils.sanitizeFileName(name));
   }
-  
+
   /**
-   * Tests special FAT32 characters are allowed.
+   * Tests {@link FileUtils#sanitizeFileName(String)} with special FAT32
+   * characters. Verifies that they are allowed.
    */
   public void testSanitizeFileName_special_characters() {
     String name = "$%'-_@~`!(){}^#&+,;=[] ";
     String expected = "$%'-_@~`!(){}^#&+,;=[] ";
-    
-    assertEquals(expected, fileUtils.sanitizeFileName(name));
+    assertEquals(expected, FileUtils.sanitizeFileName(name));
   }
 
   /**
-   * Testing collapsing multiple underscores characters.
+   * Tests {@link FileUtils#sanitizeFileName(String)} with multiple escaped
+   * characters in a row. Verifies that they are collapsed into one underscore.
    */
   public void testSanitizeFileName_collapse() {
     String name = "hello//there";
     String expected = "hello_there";
-    
-    assertEquals(expected, fileUtils.sanitizeFileName(name));
+    assertEquals(expected, FileUtils.sanitizeFileName(name));
   }
-  
+
+  /**
+   * Tests {@link FileUtils#truncateFileName(File, String, String)}. Verifies
+   * the a long file name is truncated.
+   */
   public void testTruncateFileName() {
     File directory = new File("/dir1/dir2/");
     String suffix = ".gpx";
@@ -109,36 +112,12 @@ public class FileUtilsTest extends TestCase {
       name[i] = 'a';
     }
     String nameString = new String(name);
-    
-    String truncated = fileUtils.truncateFileName(directory, nameString, suffix);
+    String truncated = FileUtils.truncateFileName(directory, nameString, suffix);
+
     for (int i = 0; i < truncated.length(); i++) {
       assertEquals('a', truncated.charAt(i));
     }
     assertEquals(FileUtils.MAX_FAT32_PATH_LENGTH,
         new File(directory, truncated + suffix).getPath().length());
   }
-  
-  public void testBuildUniqueFileName_someExist() {
-    existingFiles = new HashSet<String>();
-    existingFiles.add("Filename.ext");
-    existingFiles.add("Filename(1).ext");
-    existingFiles.add("Filename(2).ext");
-    existingFiles.add("Filename(3).ext");
-    existingFiles.add("Filename(4).ext");
-
-    String filename = fileUtils.buildUniqueFileName(new File("/dir/"), "Filename", "ext");
-    assertEquals("Filename(5).ext", filename);
-  }
-
-  public void testBuildUniqueFileName_oneExists() {
-    existingFiles.add("Filename.ext");
-
-    String filename = fileUtils.buildUniqueFileName(new File("/dir/"), "Filename", "ext");
-    assertEquals("Filename(1).ext", filename);
-  }
-
-  public void testBuildUniqueFileName_noneExists() {
-    String filename = fileUtils.buildUniqueFileName(new File("/dir/"), "Filename", "ext");
-    assertEquals("Filename.ext", filename);
-  }
 }