diff --git a/MyTracks/res/layout/about.xml b/MyTracks/res/layout/about.xml
index e98c5982f..88a026d4a 100644
--- a/MyTracks/res/layout/about.xml
+++ b/MyTracks/res/layout/about.xml
@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView" >
   <LinearLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical"
     android:padding="8dp" >
     <TextView
diff --git a/MyTracks/res/layout/aggregated_stats.xml b/MyTracks/res/layout/aggregated_stats.xml
index 7c8f01024..b32fc1498 100644
--- a/MyTracks/res/layout/aggregated_stats.xml
+++ b/MyTracks/res/layout/aggregated_stats.xml
@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView">
   <TableLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:padding="8dp"
     android:shrinkColumns="0,2"
     android:stretchColumns="0,2" >
diff --git a/MyTracks/res/layout/chart.xml b/MyTracks/res/layout/chart.xml
index b5d169658..3e5906f07 100644
--- a/MyTracks/res/layout/chart.xml
+++ b/MyTracks/res/layout/chart.xml
@@ -15,14 +15,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent"
   android:orientation="vertical" >
   <LinearLayout
     android:id="@+id/chart_view_layout"
     android:layout_height="0dp"
     android:layout_weight="1"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical" >
   </LinearLayout>
   <ZoomControls
@@ -30,6 +30,6 @@ limitations under the License.
     android:gravity="right"
     android:id="@+id/chart_zoom_controls"
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:paddingRight="8dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/MyTracks/res/layout/choose_activity_list_item.xml b/MyTracks/res/layout/choose_activity_list_item.xml
index 60b4758c9..a7a18609d 100644
--- a/MyTracks/res/layout/choose_activity_list_item.xml
+++ b/MyTracks/res/layout/choose_activity_list_item.xml
@@ -17,7 +17,7 @@ limitations under the License.
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:gravity="center_vertical"
   android:layout_height="wrap_content"
-  android:layout_width="fill_parent"
+  android:layout_width="match_parent"
   android:minHeight="?android:attr/listPreferredItemHeight"
   android:orientation="horizontal"
   android:paddingLeft="16dp"
diff --git a/MyTracks/res/layout/choose_map.xml b/MyTracks/res/layout/choose_map.xml
index 4f5d00f94..4175dd98c 100644
--- a/MyTracks/res/layout/choose_map.xml
+++ b/MyTracks/res/layout/choose_map.xml
@@ -15,12 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent" >
+  android:layout_height="match_parent"
+  android:layout_width="match_parent" >
   <ListView
     android:id="@+id/choose_map_list_view"
-    android:layout_height="fill_parent"
-    android:layout_width="fill_parent" />
+    android:layout_height="match_parent"
+    android:layout_width="match_parent" />
   <TextView
     android:id="@+id/choose_map_empty_view"
     style="@style/ListEmptyTextView" >
diff --git a/MyTracks/res/layout/choose_map_item.xml b/MyTracks/res/layout/choose_map_item.xml
index 20da468ef..6332033b8 100644
--- a/MyTracks/res/layout/choose_map_item.xml
+++ b/MyTracks/res/layout/choose_map_item.xml
@@ -17,7 +17,7 @@ limitations under the License.
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:gravity="center_vertical"
   android:layout_height="wrap_content"
-  android:layout_width="fill_parent"
+  android:layout_width="match_parent"
   android:minHeight="?android:attr/listPreferredItemHeight"
   android:orientation="vertical"
   android:padding="8dp" >
diff --git a/MyTracks/res/layout/choose_upload_service.xml b/MyTracks/res/layout/choose_upload_service.xml
index 2e20d0cbe..6e36c969e 100644
--- a/MyTracks/res/layout/choose_upload_service.xml
+++ b/MyTracks/res/layout/choose_upload_service.xml
@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView" >
   <TableLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:padding="8dp"
     android:stretchColumns="1" >
     <TableRow>
diff --git a/MyTracks/res/layout/confirm_sharing.xml b/MyTracks/res/layout/confirm_sharing.xml
index d13425cfa..5c738ca54 100644
--- a/MyTracks/res/layout/confirm_sharing.xml
+++ b/MyTracks/res/layout/confirm_sharing.xml
@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView" >
   <LinearLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical"
     android:paddingBottom="12dp"
     android:paddingLeft="14dp"
@@ -32,7 +32,7 @@ limitations under the License.
       android:id="@+id/confirm_sharing_check_box"
       android:layout_height="wrap_content"
       android:layout_marginTop="8dp"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:text="@string/generic_do_not_show_again"
       style="@style/TextMedium" />
   </LinearLayout>
diff --git a/MyTracks/res/layout/help.xml b/MyTracks/res/layout/help.xml
index 930e7bbbc..16341955c 100644
--- a/MyTracks/res/layout/help.xml
+++ b/MyTracks/res/layout/help.xml
@@ -15,13 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent"
   android:orientation="vertical" >
   <ScrollView style="@style/ScrollView.WithBottomButtons" >
     <LinearLayout
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="vertical"
       android:padding="8dp" >
       <ImageView
diff --git a/MyTracks/res/layout/list_item.xml b/MyTracks/res/layout/list_item.xml
index 7c249c7c1..c1bc8fdba 100644
--- a/MyTracks/res/layout/list_item.xml
+++ b/MyTracks/res/layout/list_item.xml
@@ -17,7 +17,7 @@ limitations under the License.
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:gravity="center_vertical"
   android:layout_height="wrap_content"
-  android:layout_width="fill_parent"
+  android:layout_width="match_parent"
   android:minHeight="?android:attr/listPreferredItemHeight"
   android:orientation="horizontal"
   android:padding="8dp" >
@@ -29,11 +29,11 @@ limitations under the License.
   <LinearLayout
     android:layout_height="wrap_content"
     android:layout_marginLeft="8dp"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical" >
     <LinearLayout
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="horizontal" >
       <TextView
         android:id="@+id/list_item_name"
@@ -47,7 +47,7 @@ limitations under the License.
     </LinearLayout>
     <LinearLayout
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="horizontal" >
       <TextView
         android:id="@+id/list_item_total_time"
diff --git a/MyTracks/res/layout/map.xml b/MyTracks/res/layout/map.xml
index 95e75eaf9..7e05571a6 100644
--- a/MyTracks/res/layout/map.xml
+++ b/MyTracks/res/layout/map.xml
@@ -16,15 +16,15 @@ limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/map_container"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent" >
+  android:layout_height="match_parent"
+  android:layout_width="match_parent" >
   <TextView
     android:background="@color/warning_background"
     android:drawableLeft="@drawable/warning"
     android:gravity="center"
     android:id="@+id/map_message"
     android:layout_alignParentTop="true"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:padding="8dp"
     android:textColor="@android:color/primary_text_dark"
     android:visibility="gone"
diff --git a/MyTracks/res/layout/marker_detail.xml b/MyTracks/res/layout/marker_detail.xml
index 6ad261942..70f303bd5 100644
--- a/MyTracks/res/layout/marker_detail.xml
+++ b/MyTracks/res/layout/marker_detail.xml
@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView" >
   <LinearLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical"
     android:padding="8dp" >
     <TextView
@@ -27,7 +27,7 @@ limitations under the License.
     <LinearLayout
       android:id="@+id/marker_detail_waypoint_section"
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="vertical" >
       <TextView
         android:id="@+id/marker_detail_waypoint_marker_type"
@@ -39,14 +39,14 @@ limitations under the License.
     <LinearLayout
       android:id="@+id/marker_detail_statistics_section"
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="vertical" >
       <TextView
         android:text="@string/marker_detail_statistics_title"
         style="@style/TextLarge.WithTopMargin" />
       <TableLayout
         android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:paddingTop="8dp"
         android:shrinkColumns="0,2"
         android:stretchColumns="0,2" >
diff --git a/MyTracks/res/layout/marker_edit.xml b/MyTracks/res/layout/marker_edit.xml
index 5175394ae..90cd620c3 100644
--- a/MyTracks/res/layout/marker_edit.xml
+++ b/MyTracks/res/layout/marker_edit.xml
@@ -15,13 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent"
   android:orientation="vertical" >
   <ScrollView style="@style/ScrollView.WithBottomButtons" >
     <LinearLayout
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="vertical"
       android:padding="8dp" >
       <TextView
@@ -30,7 +30,7 @@ limitations under the License.
       <LinearLayout
         android:id="@+id/marker_edit_statistics_section"
         android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:orientation="vertical" >
         <EditText
           android:drawableLeft="@drawable/yellow_pushpin"
@@ -42,7 +42,7 @@ limitations under the License.
       <LinearLayout
         android:id="@+id/marker_edit_waypoint_section"
         android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:orientation="vertical" >
         <EditText
           android:drawableLeft="@drawable/blue_pushpin"
diff --git a/MyTracks/res/layout/marker_list.xml b/MyTracks/res/layout/marker_list.xml
index 53e230ab5..623a4f0fa 100644
--- a/MyTracks/res/layout/marker_list.xml
+++ b/MyTracks/res/layout/marker_list.xml
@@ -15,12 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent" >
+  android:layout_height="match_parent"
+  android:layout_width="match_parent" >
   <ListView
     android:id="@+id/marker_list"
-    android:layout_height="fill_parent"
-    android:layout_width="fill_parent" />
+    android:layout_height="match_parent"
+    android:layout_width="match_parent" />
   <TextView
     android:id="@+id/marker_list_empty"
     android:text="@string/marker_list_empty_message"
diff --git a/MyTracks/res/layout/search_list.xml b/MyTracks/res/layout/search_list.xml
index 21995c42c..59a81774a 100644
--- a/MyTracks/res/layout/search_list.xml
+++ b/MyTracks/res/layout/search_list.xml
@@ -15,12 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent" >
+  android:layout_height="match_parent"
+  android:layout_width="match_parent" >
   <ListView
     android:id="@+id/search_list"
-    android:layout_height="fill_parent"
-    android:layout_width="fill_parent" />
+    android:layout_height="match_parent"
+    android:layout_width="match_parent" />
   <TextView
     android:id="@+id/search_list_empty"
     android:text="@string/search_list_empty_message"
diff --git a/MyTracks/res/layout/sensor_state.xml b/MyTracks/res/layout/sensor_state.xml
index e1b066f5b..b0dabf2ac 100644
--- a/MyTracks/res/layout/sensor_state.xml
+++ b/MyTracks/res/layout/sensor_state.xml
@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView" >
   <LinearLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical"
     android:padding="8dp" >
     <TextView
diff --git a/MyTracks/res/layout/stats.xml b/MyTracks/res/layout/stats.xml
index 15b0e9c43..82ce3bf09 100644
--- a/MyTracks/res/layout/stats.xml
+++ b/MyTracks/res/layout/stats.xml
@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView" >
   <TableLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:padding="8dp"
     android:shrinkColumns="0,2"
     android:stretchColumns="0,2" >
diff --git a/MyTracks/res/layout/track_controller.xml b/MyTracks/res/layout/track_controller.xml
index 923a638e4..5206a5a86 100644
--- a/MyTracks/res/layout/track_controller.xml
+++ b/MyTracks/res/layout/track_controller.xml
@@ -18,12 +18,12 @@ limitations under the License.
   <LinearLayout
     android:background="@color/black"
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="horizontal"
     android:paddingBottom="8dp"
     android:paddingTop="8dp" >
     <View
-      android:layout_height="fill_parent"
+      android:layout_height="match_parent"
       android:layout_weight="1"
       android:layout_width="0dp" />
     <ImageButton
@@ -34,7 +34,7 @@ limitations under the License.
       android:layout_weight="10"
       android:layout_width="0dp" />
     <RelativeLayout
-      android:layout_height="fill_parent"
+      android:layout_height="match_parent"
       android:layout_weight="6"
       android:layout_width="0dp" >
       <TextView
@@ -63,12 +63,12 @@ limitations under the License.
       android:layout_width="0dp"
       android:src="@drawable/btn_stop_1" />
     <View
-      android:layout_height="fill_parent"
+      android:layout_height="match_parent"
       android:layout_weight="1"
       android:layout_width="0dp" />
   </LinearLayout>
   <View
     android:background="@color/gray"
     android:layout_height="1dp"
-    android:layout_width="fill_parent" />
+    android:layout_width="match_parent" />
 </merge>
\ No newline at end of file
diff --git a/MyTracks/res/layout/track_detail.xml b/MyTracks/res/layout/track_detail.xml
index 2284175c0..6e15644f0 100644
--- a/MyTracks/res/layout/track_detail.xml
+++ b/MyTracks/res/layout/track_detail.xml
@@ -15,23 +15,23 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent"
   android:orientation="vertical" >
   <TabHost
     android:id="@android:id/tabhost"
     android:layout_height="0dp"
     android:layout_weight="1"
-    android:layout_width="fill_parent" >
+    android:layout_width="match_parent" >
     <LinearLayout
-      android:layout_height="fill_parent"
-      android:layout_width="fill_parent"
+      android:layout_height="match_parent"
+      android:layout_width="match_parent"
       android:orientation="vertical" >
       <TabWidget
         android:id="@android:id/tabs"
         android:layout_height="wrap_content"
         android:layout_weight="0"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:orientation="horizontal" />
       <FrameLayout
         android:id="@android:id/tabcontent"
@@ -42,7 +42,7 @@ limitations under the License.
         android:id="@+id/realtabcontent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:layout_width="fill_parent" />
+        android:layout_width="match_parent" />
     </LinearLayout>
   </TabHost>
   <LinearLayout
diff --git a/MyTracks/res/layout/track_edit.xml b/MyTracks/res/layout/track_edit.xml
index 5d524e1db..84805ea81 100644
--- a/MyTracks/res/layout/track_edit.xml
+++ b/MyTracks/res/layout/track_edit.xml
@@ -15,13 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent"
   android:orientation="vertical" >
   <ScrollView style="@style/ScrollView.WithBottomButtons" >
     <LinearLayout
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="vertical"
       android:padding="8dp" >
       <TextView
diff --git a/MyTracks/res/layout/track_list.xml b/MyTracks/res/layout/track_list.xml
index ad2ea10dd..53cb1bcad 100644
--- a/MyTracks/res/layout/track_list.xml
+++ b/MyTracks/res/layout/track_list.xml
@@ -15,19 +15,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent"
   android:orientation="vertical" >
   <ListView
     android:id="@+id/track_list"
     android:layout_height="0dp"
     android:layout_weight="1.0"
-    android:layout_width="fill_parent" />
+    android:layout_width="match_parent" />
   <TextView
     android:id="@+id/track_list_empty_view"
     android:layout_height="0dp"
     android:layout_weight="1.0"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:text="@string/track_list_empty_message"
     android:visibility="gone"
     style="@style/ListEmptyTextView" >
diff --git a/MyTracks/res/layout/track_widget_4x1.xml b/MyTracks/res/layout/track_widget_4x1.xml
index 4263b1cdc..046e633fb 100644
--- a/MyTracks/res/layout/track_widget_4x1.xml
+++ b/MyTracks/res/layout/track_widget_4x1.xml
@@ -30,7 +30,7 @@ limitations under the License.
       style="@style/TrackWidgetButtonRecord" />
     <LinearLayout
       android:id="@+id/track_widget_stats_container"
-      android:layout_height="fill_parent"
+      android:layout_height="match_parent"
       android:layout_weight="18"
       android:layout_width="0dp"
       android:padding="0dp"
diff --git a/MyTracks/res/layout/track_widget_config.xml b/MyTracks/res/layout/track_widget_config.xml
index 93d910ceb..a7c3a1e3e 100644
--- a/MyTracks/res/layout/track_widget_config.xml
+++ b/MyTracks/res/layout/track_widget_config.xml
@@ -15,13 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent"
   android:orientation="vertical" >
   <ScrollView style="@style/ScrollView.WithBottomButtons" >
     <LinearLayout
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="vertical"
       android:padding="8dp" >
       <Spinner
diff --git a/MyTracks/res/layout/upload_result.xml b/MyTracks/res/layout/upload_result.xml
index a80942010..9e3ca584e 100644
--- a/MyTracks/res/layout/upload_result.xml
+++ b/MyTracks/res/layout/upload_result.xml
@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView" >
   <LinearLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical"
     android:padding="8dp" >
     <!-- Google Maps result -->
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index e160ce22b..2be5ec6ca 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -29,7 +29,7 @@ limitations under the License.
   <!-- bottom button bar -->
   <style name="BottomButtonBar" parent="@android:style/DeviceDefault.ButtonBar">
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_width">match_parent</item>
     <item name="android:orientation">horizontal</item>
     <item name="android:measureWithLargestChild">true</item>
   </style>
@@ -48,25 +48,25 @@ limitations under the License.
   </style>
   <!-- edit category -->
   <style name="EditCategory" parent="@style/TextMedium">
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_width">match_parent</item>
     <item name="android:selectAllOnFocus">true</item>
     <item name="android:singleLine">true</item>
   </style>
   <!-- edit description -->
   <style name="EditDescription" parent="@style/TextMedium">
     <item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item>
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_width">match_parent</item>
     <item name="android:maxLines">50</item>
     <item name="android:selectAllOnFocus">true</item>
     <item name="android:singleLine">false</item>
   </style>
   <!-- edit label -->
   <style name="EditLabel" parent="@style/TextMedium">
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_width">match_parent</item>
   </style>
   <!-- edit label with icon -->
   <style name="EditLabel.WithIcon" parent="@style/TextMedium.WithIcon">
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_width">match_parent</item>
   </style>
   <!-- edit label with icon, width padding top -->
   <style name="EditLabel.WithIcon.WithPaddingTop">
@@ -79,14 +79,14 @@ limitations under the License.
   <!-- edit name marker -->
   <style name="EditNameMarker" parent="@style/TextMedium.WithIcon">
     <item name="android:inputType">textAutoCorrect|textCapWords</item>
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_width">match_parent</item>
     <item name="android:selectAllOnFocus">true</item>
     <item name="android:singleLine">true</item>
   </style>
   <!-- edit name track -->
   <style name="EditNameTrack" parent="@style/TextMedium">
     <item name="android:inputType">textAutoCorrect|textCapWords</item>
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_width">match_parent</item>
     <item name="android:selectAllOnFocus">true</item>
     <item name="android:singleLine">true</item>
   </style>
@@ -113,8 +113,8 @@ limitations under the License.
   </style>
   <!-- scroll view -->
   <style name="ScrollView">
-    <item name="android:layout_height">fill_parent</item>
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_height">match_parent</item>
+    <item name="android:layout_width">match_parent</item>
     <item name="android:scrollbarStyle">outsideInset</item>
   </style>
   <!-- scroll view with bottom buttons -->
@@ -126,7 +126,7 @@ limitations under the License.
   <style name="SensorStateValue" parent="@style/TextLarge">
     <item name="android:background">@android:color/background_light</item>
     <item name="android:gravity">right</item>
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_width">match_parent</item>
     <item name="android:paddingRight">8dp</item>
     <item name="android:textColor">@android:color/primary_text_light</item>
   </style>
@@ -137,7 +137,7 @@ limitations under the License.
   </style>
   <!-- stats spacer -->
   <style name="StatsSpacer">
-    <item name="android:layout_height">fill_parent</item>
+    <item name="android:layout_height">match_parent</item>
     <item name="android:layout_width">8dp</item>
   </style>
   <!-- stats value -->
@@ -191,14 +191,14 @@ limitations under the License.
   <!-- track controller container -->
   <style name="TrackControllerContainer">
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_width">match_parent</item>
     <item name="android:orientation">vertical</item>
   </style>
   <!-- track widget bounding box -->
   <style name="TrackWidgetBoundingBox">
     <item name="android:background">@drawable/track_widget_background</item>
-    <item name="android:layout_height">fill_parent</item>
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_height">match_parent</item>
+    <item name="android:layout_width">match_parent</item>
     <item name="android:padding">@dimen/widget_margin</item>
   </style>
   <!-- track widget button -->
@@ -212,7 +212,7 @@ limitations under the License.
     <item name="android:gravity">center_vertical</item>
     <item name="android:layout_height">0dp</item>
     <item name="android:layout_weight">1</item>
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_width">match_parent</item>
     <item name="android:orientation">horizontal</item>
     <item name="android:paddingBottom">4dp</item>
     <item name="android:paddingTop">4dp</item>
@@ -234,13 +234,13 @@ limitations under the License.
     <item name="android:layout_gravity">center_horizontal</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_margin">8dp</item>
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_width">match_parent</item>
   </style>
   <!-- Track widget frame -->
   <style name="TrackWidgetFrame">
     <item name="android:layout_alignParentTop">true</item>
-    <item name="android:layout_height">fill_parent</item>
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_height">match_parent</item>
+    <item name="android:layout_width">match_parent</item>
     <item name="android:orientation">vertical</item>
   </style>
   <!-- track widget horizontal line -->
@@ -257,7 +257,7 @@ limitations under the License.
   <!-- track widget horizontal separator -->
   <style name="TrackWidgetHorizontalSeparator">
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_width">match_parent</item>
     <item name="android:orientation">horizontal</item>
   </style>
   <!-- track widget item container -->
@@ -319,7 +319,7 @@ limitations under the License.
   <style name="TrackWidgetStatsContainer">
     <item name="android:clickable">true</item>
     <item name="android:layout_height">0dp</item>
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_width">match_parent</item>
     <item name="android:orientation">vertical</item>
     <item name="android:padding">4dp</item>
   </style>
@@ -328,7 +328,7 @@ limitations under the License.
     <item name="android:gravity">center_vertical</item>
     <item name="android:layout_height">0dp</item>
     <item name="android:layout_weight">1</item>
-    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_width">match_parent</item>
     <item name="android:orientation">horizontal</item>
   </style>
   <!-- track widget unit -->
@@ -390,7 +390,7 @@ limitations under the License.
   </style>
   <!-- track widget vertical separator -->
   <style name="TrackWidgetVerticalSeparator">
-    <item name="android:layout_height">fill_parent</item>
+    <item name="android:layout_height">match_parent</item>
     <item name="android:layout_width">wrap_content</item>
     <item name="android:orientation">vertical</item>
   </style>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java
index edc036f32..bb19e0e74 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java
@@ -125,13 +125,12 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     return view;
   }
 
-  @SuppressWarnings("deprecation")
   @Override
   public void onStart() {
     super.onStart();
     ViewGroup layout = (ViewGroup) getActivity().findViewById(R.id.chart_view_layout);
     LayoutParams layoutParams = new LayoutParams(
-        LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
+        LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
     layout.addView(chartView, layoutParams);
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/ControlRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/ControlRecordingService.java
index 3fb94f757..342147931 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/ControlRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/ControlRecordingService.java
@@ -103,21 +103,21 @@ public class ControlRecordingService extends IntentService implements ServiceCon
    * Handles the intent to start or stop a recording.
    * 
    * @param intent to be handled
-   * @param trackRecordingService the trackRecordingService
+   * @param service the trackRecordingService
    */
   @VisibleForTesting
-  void onHandleIntent(Intent intent, @SuppressWarnings("hiding") ITrackRecordingService trackRecordingService) {
+  void onHandleIntent(Intent intent, ITrackRecordingService service) {
     String action = intent.getAction();
     if (action != null) {
       try {
         if (action.equals(getString(R.string.track_action_start))) {
-          trackRecordingService.startNewTrack();
+          service.startNewTrack();
         } else if (action.equals(getString(R.string.track_action_end))) {
-          trackRecordingService.endCurrentTrack();
+          service.endCurrentTrack();
         } else if (action.equals(getString(R.string.track_action_pause))) {
-          trackRecordingService.pauseCurrentTrack();
+          service.pauseCurrentTrack();
         } else if (action.equals(getString(R.string.track_action_resume))) {
-          trackRecordingService.resumeCurrentTrack();
+          service.resumeCurrentTrack();
         }
       } catch (RemoteException e) {
         Log.d(TAG, "ControlRecordingService onHandleIntent RemoteException", e);
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImplTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImplTest.java
index ee5cadd22..315dcf01f 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImplTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImplTest.java
@@ -453,9 +453,8 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
         return MyTracksProviderUtilsImplTest.MOCK_DESC;
       }
   
-      @SuppressWarnings("hiding")
       @Override
-      public String generateTrackDescription(Track track, Vector<Double> distances,
+      public String generateTrackDescription(Track aTrack, Vector<Double> distances,
           Vector<Double> elevations, boolean html) {
         return null;
       }
@@ -509,9 +508,8 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
         return MyTracksProviderUtilsImplTest.MOCK_DESC;
       }
   
-      @SuppressWarnings("hiding")
       @Override
-      public String generateTrackDescription(Track track, Vector<Double> distances,
+      public String generateTrackDescription(Track aTrack, Vector<Double> distances,
           Vector<Double> elevations, boolean html) {
         return null;
       }
@@ -653,14 +651,8 @@ public class MyTracksProviderUtilsImplTest extends AndroidTestCase {
   }
 
   /**
-   * Tests the method {@link MyTracksProviderUtilsImpl#createLocation(Cursor)}.
-   * This test also covers the method
-   * {@link MyTracksProviderUtilsImpl#fillLocation(Cursor, Location)} and
-   * {@link MyTracksProviderUtilsImpl#fillLocation(Cursor, MyTracksProviderUtilsImpl.CachedTrackPointsIndexes, Location)}
-   * and the inner class
-   * {@link MyTracksProviderUtilsImpl.CachedTrackPointsIndexes}.
+   * Tests the method {@link MyTracksProviderUtilsImpl#createTrackPoint(Cursor)}.
    */
-  @SuppressWarnings("javadoc")
   @UsesMocks(Cursor.class)
   public void testCreateTrackPoint() {
     Cursor cursorMock = AndroidMock.createNiceMock(Cursor.class);