Autoformatted all resources.

src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,10 +15,10 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    package="com.google.android.maps.mytracks"
     android:installLocation="auto"
     android:versionCode="74"
-  android:versionName="2.0.6"
+    android:versionName="2.0.6">
-  package="com.google.android.maps.mytracks" >
     <!-- Permission to initialize services -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -70,6 +69,7 @@ limitations under the License.
     <uses-feature
         android:name="android.hardware.touchscreen.multitouch"
         android:required="false" />
+
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
@@ -82,18 +82,20 @@ limitations under the License.
         android:icon="@drawable/ic_logo"
         android:label="@string/app_name"
         android:theme="@style/ThemeCustom"
-    tools:replace="android:label" >
+        tools:replace="android:label">
         <!-- Activities -->
         <activity
-      android:label="@string/menu_aggregated_statistics"
+            android:name="com.google.android.apps.mytracks.AggregatedStatsActivity"
-      android:name="com.google.android.apps.mytracks.AggregatedStatsActivity" />
+            android:label="@string/menu_aggregated_statistics" />
         <activity android:name="com.google.android.apps.mytracks.DeleteActivity" />
-      <activity android:name="com.google.android.apps.mytracks.io.file.importer.ImportActivity" >
+        <activity android:name="com.google.android.apps.mytracks.io.file.importer.ImportActivity">
             <intent-filter>
                 <action android:name="android.intent.action.ATTACH_DATA" />
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="application/gpx" />
                 <data android:mimeType="application/gpx+xml" />
                 <data android:mimeType="application/vnd.google-earth.gpx" />
@@ -104,15 +106,15 @@ limitations under the License.
         <activity android:name="com.google.android.apps.mytracks.MarkerEditActivity" />
         <activity android:name="com.google.android.apps.mytracks.MarkerDetailActivity" />
         <activity
-      android:label="@string/menu_markers"
+            android:name="com.google.android.apps.mytracks.MarkerListActivity"
-      android:name="com.google.android.apps.mytracks.MarkerListActivity" >
+            android:label="@string/menu_markers">
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="com.google.android.apps.mytracks.SearchListActivity" />
         </activity>
         <activity
-      android:launchMode="singleTop"
+            android:name="com.google.android.apps.mytracks.SearchListActivity"
-      android:name="com.google.android.apps.mytracks.SearchListActivity" >
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -122,13 +124,13 @@ limitations under the License.
         </activity>
         <activity
             android:name="com.google.android.apps.mytracks.TrackDetailActivity"
-      android:parentActivityName="com.google.android.apps.mytracks.TrackListActivity" >
+            android:parentActivityName="com.google.android.apps.mytracks.TrackListActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.google.android.apps.mytracks.TrackListActivity" />
         </activity>
         <activity android:name="com.google.android.apps.mytracks.TrackEditActivity" />
-    <activity android:name="com.google.android.apps.mytracks.TrackListActivity" >
+        <activity android:name="com.google.android.apps.mytracks.TrackListActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -145,28 +147,29 @@ limitations under the License.
         <activity android:name="com.google.android.apps.mytracks.settings.SettingsActivity" />
         <activity android:name="com.google.android.apps.mytracks.settings.StatsSettingsActivity" />
         <activity
-      android:label="@string/track_widget_config_title"
+            android:name="com.google.android.apps.mytracks.widgets.TrackWidgetConfigActivity"
-      android:name="com.google.android.apps.mytracks.widgets.TrackWidgetConfigActivity" >
+            android:label="@string/track_widget_config_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
         </activity>
+
         <service
-      android:exported="false"
+            android:name="com.google.android.apps.mytracks.services.ControlRecordingService"
-      android:name="com.google.android.apps.mytracks.services.ControlRecordingService" />
+            android:exported="false" />
         <service
+            android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
             android:enabled="true"
             android:exported="false"
             android:icon="@drawable/ic_arrow_320"
-      android:label="@string/recording_service"
+            android:label="@string/recording_service" />
-      android:name="com.google.android.apps.mytracks.services.TrackRecordingService" />
         <!-- Receivers -->
-    <receiver android:name="com.google.android.apps.mytracks.BootReceiver" >
+        <receiver android:name="com.google.android.apps.mytracks.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
-    <receiver android:name="com.google.android.apps.mytracks.widgets.TrackWidgetProvider" >
+        <receiver android:name="com.google.android.apps.mytracks.widgets.TrackWidgetProvider">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="com.google.android.apps.mytracks.TRACK_PAUSED" />
@@ -181,16 +184,15 @@ limitations under the License.
         </receiver>
         <!-- Providers -->
         <provider
+            android:name="com.google.android.apps.mytracks.content.CustomContentProvider"
             android:authorities="com.google.android.maps.mytracks"
             android:exported="false"
-      android:grantUriPermissions="true"
+            android:grantUriPermissions="true" />
-      android:name="com.google.android.apps.mytracks.content.CustomContentProvider"
-    />
         <!-- Search suggestion provider -->
         <provider
+            android:name="com.google.android.apps.mytracks.content.SearchEngineProvider"
             android:authorities="com.google.android.maps.mytracks.search"
-      android:exported="false"
+            android:exported="false" />
-      android:name="com.google.android.apps.mytracks.content.SearchEngineProvider" />
 
         <provider
             android:name="androidx.core.content.FileProvider"

src/main/res/anim/fadeout.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");

src/main/res/drawable/activated_background_holo_dark.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project
-<!-- Copyright (C) 2008 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,6 +14,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true" android:drawable="@drawable/list_activated_holo" />
+    <item android:drawable="@drawable/list_activated_holo" android:state_activated="true" />
     <item android:drawable="@android:color/transparent" />
 </selector>

src/main/res/drawable/btn_check_holo_dark.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2011 The Android Open Source Project
-<!-- Copyright (C) 2011 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -18,48 +17,27 @@
 
     <!-- Enabled states -->
 
-    <item android:state_checked="true" android:state_window_focused="false"
+    <item android:drawable="@drawable/btn_check_on_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_window_focused="false" />
-          android:state_enabled="true"
+    <item android:drawable="@drawable/btn_check_off_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_window_focused="false" />
-          android:drawable="@drawable/btn_check_on_holo_dark" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_off_holo_dark" />
 
-    <item android:state_checked="true" android:state_pressed="true"
+    <item android:drawable="@drawable/btn_check_on_pressed_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_pressed="true" />
-          android:state_enabled="true"
+    <item android:drawable="@drawable/btn_check_off_pressed_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_pressed="true" />
-          android:drawable="@drawable/btn_check_on_pressed_holo_dark" />
-    <item android:state_checked="false" android:state_pressed="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_off_pressed_holo_dark" />
 
-    <item android:state_checked="true" android:state_focused="true"
+    <item android:drawable="@drawable/btn_check_on_focused_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_focused="true" />
-          android:state_enabled="true"
+    <item android:drawable="@drawable/btn_check_off_focused_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_focused="true" />
-          android:drawable="@drawable/btn_check_on_focused_holo_dark" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_off_focused_holo_dark" />
-
-    <item android:state_checked="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_off_holo_dark" />
-    <item android:state_checked="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_on_holo_dark" />
 
+    <item android:drawable="@drawable/btn_check_off_holo_dark" android:state_checked="false" android:state_enabled="true" />
+    <item android:drawable="@drawable/btn_check_on_holo_dark" android:state_checked="true" android:state_enabled="true" />
 
     <!-- Disabled states -->
 
-    <item android:state_checked="true" android:state_window_focused="false"
+    <item android:drawable="@drawable/btn_check_on_disabled_holo_dark" android:state_checked="true" android:state_window_focused="false" />
-          android:drawable="@drawable/btn_check_on_disabled_holo_dark" />
+    <item android:drawable="@drawable/btn_check_off_disabled_holo_dark" android:state_checked="false" android:state_window_focused="false" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:drawable="@drawable/btn_check_off_disabled_holo_dark" />
 
-    <item android:state_checked="true" android:state_focused="true"
+    <item android:drawable="@drawable/btn_check_on_disabled_focused_holo_dark" android:state_checked="true" android:state_focused="true" />
-          android:drawable="@drawable/btn_check_on_disabled_focused_holo_dark" />
+    <item android:drawable="@drawable/btn_check_off_disabled_focused_holo_dark" android:state_checked="false" android:state_focused="true" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:drawable="@drawable/btn_check_off_disabled_focused_holo_dark" />
 
-    <item android:state_checked="false" android:drawable="@drawable/btn_check_off_disabled_holo_dark" />
+    <item android:drawable="@drawable/btn_check_off_disabled_holo_dark" android:state_checked="false" />
-    <item android:state_checked="true" android:drawable="@drawable/btn_check_on_disabled_holo_dark" />
+    <item android:drawable="@drawable/btn_check_on_disabled_holo_dark" android:state_checked="true" />
 
 </selector>

src/main/res/drawable/btn_radio_holo_dark.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2011 The Android Open Source Project
-<!-- Copyright (C) 2011 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,45 +14,27 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:state_window_focused="false"
+    <item android:drawable="@drawable/btn_radio_on_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_window_focused="false" />
-          android:state_enabled="true"
+    <item android:drawable="@drawable/btn_radio_off_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_window_focused="false" />
-          android:drawable="@drawable/btn_radio_on_holo_dark" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_holo_dark" />
 
-    <item android:state_checked="true" android:state_pressed="true"
+    <item android:drawable="@drawable/btn_radio_on_pressed_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_pressed="true" />
-          android:state_enabled="true"
+    <item android:drawable="@drawable/btn_radio_off_pressed_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_pressed="true" />
-          android:drawable="@drawable/btn_radio_on_pressed_holo_dark" />
-    <item android:state_checked="false" android:state_pressed="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_pressed_holo_dark" />
 
-    <item android:state_checked="true" android:state_focused="true"
+    <item android:drawable="@drawable/btn_radio_on_focused_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_focused="true" />
-          android:state_enabled="true"
+    <item android:drawable="@drawable/btn_radio_off_focused_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_focused="true" />
-          android:drawable="@drawable/btn_radio_on_focused_holo_dark" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_focused_holo_dark" />
 
-    <item android:state_checked="false" android:state_enabled="true"
+    <item android:drawable="@drawable/btn_radio_off_holo_dark" android:state_checked="false" android:state_enabled="true" />
-          android:drawable="@drawable/btn_radio_off_holo_dark" />
+    <item android:drawable="@drawable/btn_radio_on_holo_dark" android:state_checked="true" android:state_enabled="true" />
-    <item android:state_checked="true" android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_on_holo_dark" />
 
     <!-- Disabled states -->
 
-    <item android:state_checked="true" android:state_window_focused="false"
+    <item android:drawable="@drawable/btn_radio_on_disabled_holo_dark" android:state_checked="true" android:state_window_focused="false" />
-          android:drawable="@drawable/btn_radio_on_disabled_holo_dark" />
+    <item android:drawable="@drawable/btn_radio_off_disabled_holo_dark" android:state_checked="false" android:state_window_focused="false" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:drawable="@drawable/btn_radio_off_disabled_holo_dark" />
 
-    <item android:state_checked="true" android:state_focused="true"
+    <item android:drawable="@drawable/btn_radio_on_disabled_focused_holo_dark" android:state_checked="true" android:state_focused="true" />
-          android:drawable="@drawable/btn_radio_on_disabled_focused_holo_dark" />
+    <item android:drawable="@drawable/btn_radio_off_disabled_focused_holo_dark" android:state_checked="false" android:state_focused="true" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:drawable="@drawable/btn_radio_off_disabled_focused_holo_dark" />
 
-    <item android:state_checked="false" android:drawable="@drawable/btn_radio_off_disabled_holo_dark" />
+    <item android:drawable="@drawable/btn_radio_off_disabled_holo_dark" android:state_checked="false" />
-    <item android:state_checked="true" android:drawable="@drawable/btn_radio_on_disabled_holo_dark" />
+    <item android:drawable="@drawable/btn_radio_on_disabled_holo_dark" android:state_checked="true" />
 
 </selector>

src/main/res/drawable/button_pause.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/ic_button_pause_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_button_pause_pressed" android:state_pressed="true" />
-  <item android:drawable="@drawable/ic_button_pause"/>
+    <item android:drawable="@drawable/ic_button_pause" />
 </selector>

src/main/res/drawable/button_record.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/ic_button_record_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_button_record_pressed" android:state_pressed="true" />
-  <item android:drawable="@drawable/ic_button_record"/>
+    <item android:drawable="@drawable/ic_button_record" />
 </selector>

src/main/res/drawable/button_stop.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/ic_button_stop_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_button_stop_pressed" android:state_pressed="true" />
-  <item android:drawable="@drawable/ic_button_stop"/>
+    <item android:drawable="@drawable/ic_button_stop" />
 </selector>

src/main/res/drawable/edit_text_holo_dark.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project
-<!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,11 +14,11 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true" android:drawable="@drawable/textfield_default_holo_dark" />
+    <item android:drawable="@drawable/textfield_default_holo_dark" android:state_enabled="true" android:state_window_focused="false" />
-    <item android:state_window_focused="false" android:state_enabled="false" android:drawable="@drawable/textfield_disabled_holo_dark" />
+    <item android:drawable="@drawable/textfield_disabled_holo_dark" android:state_enabled="false" android:state_window_focused="false" />
-    <item android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/textfield_activated_holo_dark" />
+    <item android:drawable="@drawable/textfield_activated_holo_dark" android:state_enabled="true" android:state_focused="true" />
-    <item android:state_enabled="true" android:state_activated="true" android:drawable="@drawable/textfield_focused_holo_dark" />
+    <item android:drawable="@drawable/textfield_focused_holo_dark" android:state_activated="true" android:state_enabled="true" />
-    <item android:state_enabled="true" android:drawable="@drawable/textfield_default_holo_dark" />
+    <item android:drawable="@drawable/textfield_default_holo_dark" android:state_enabled="true" />
-    <item android:state_focused="true" android:drawable="@drawable/textfield_disabled_focused_holo_dark" />
+    <item android:drawable="@drawable/textfield_disabled_focused_holo_dark" android:state_focused="true" />
     <item android:drawable="@drawable/textfield_disabled_holo_dark" />
 </selector>

src/main/res/drawable/ic_logo.xml

@@ -1,12 +1,23 @@
-<vector android:height="24dp" android:viewportHeight="100"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="100" android:width="24dp"
+    xmlns:aapt="http://schemas.android.com/aapt"
-    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
     <path android:pathData="M82.489,12.834C83.196,10.418 82.043,9.556 79.926,10.917L10.087,55.828c-2.117,1.361 -1.795,2.628 0.714,2.815L39.806,60.807c2.51,0.188 5.291,2.267 6.18,4.621l10.282,27.208c0.89,2.354 2.195,2.304 2.902,-0.111z">
         <aapt:attr name="android:fillColor">
-            <gradient android:endX="81.73018" android:endY="11.204678"
+            <gradient
-                android:startX="27.696081" android:startY="83.44198" android:type="linear">
+                android:endX="81.73018"
-                <item android:color="#FFFBB22F" android:offset="0"/>
+                android:endY="11.204678"
-                <item android:color="#FFF58820" android:offset="1"/>
+                android:startX="27.696081"
+                android:startY="83.44198"
+                android:type="linear">
+                <item
+                    android:color="#FFFBB22F"
+                    android:offset="0" />
+                <item
+                    android:color="#FFF58820"
+                    android:offset="1" />
             </gradient>
         </aapt:attr>
     </path>

src/main/res/drawable/list_selector_background_transition_holo_dark.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project
-<!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

src/main/res/drawable/list_selector_holo_dark.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project
-<!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,12 +15,12 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_window_focused="false" android:drawable="@android:color/transparent" />
+    <item android:drawable="@android:color/transparent" android:state_window_focused="false" />
 
     <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_disabled_holo_dark" />
+    <item android:drawable="@drawable/list_selector_disabled_holo_dark" android:state_enabled="false" android:state_focused="true" android:state_pressed="true" />
-    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/list_selector_disabled_holo_dark" />
+    <item android:drawable="@drawable/list_selector_disabled_holo_dark" android:state_enabled="false" android:state_focused="true" />
-    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition_holo_dark" />
+    <item android:drawable="@drawable/list_selector_background_transition_holo_dark" android:state_focused="true" android:state_pressed="true" />
-    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition_holo_dark" />
+    <item android:drawable="@drawable/list_selector_background_transition_holo_dark" android:state_focused="false" android:state_pressed="true" />
-    <item android:state_focused="true"                                                             android:drawable="@drawable/list_focused_holo" />
+    <item android:drawable="@drawable/list_focused_holo" android:state_focused="true" />
 </selector>

src/main/res/drawable/progress_horizontal_holo_dark.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project
-<!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,17 +15,20 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:id="@android:id/background"
+    <item
+        android:id="@android:id/background"
         android:drawable="@drawable/progress_bg_holo_dark" />
 
     <item android:id="@android:id/secondaryProgress">
-        <scale android:scaleWidth="100%"
+        <scale
-               android:drawable="@drawable/progress_secondary_holo_dark" />
+            android:drawable="@drawable/progress_secondary_holo_dark"
+            android:scaleWidth="100%" />
     </item>
 
     <item android:id="@android:id/progress">
-        <scale android:scaleWidth="100%"
+        <scale
-               android:drawable="@drawable/progress_primary_holo_dark" />
+            android:drawable="@drawable/progress_primary_holo_dark"
+            android:scaleWidth="100%" />
     </item>
 
 </layer-list>

src/main/res/drawable/progress_indeterminate_horizontal_holo_dark.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 /*
 ** Copyright 2011, The Android Open Source Project
 **
@@ -16,15 +15,30 @@
 ** limitations under the License.
 */
 -->
-<animation-list
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:android="http://schemas.android.com/apk/res/android"
     android:oneshot="false">
-    <item android:drawable="@drawable/progressbar_indeterminate_holo1" android:duration="50" />
+    <item
-    <item android:drawable="@drawable/progressbar_indeterminate_holo2" android:duration="50" />
+        android:drawable="@drawable/progressbar_indeterminate_holo1"
-    <item android:drawable="@drawable/progressbar_indeterminate_holo3" android:duration="50" />
+        android:duration="50" />
-    <item android:drawable="@drawable/progressbar_indeterminate_holo4" android:duration="50" />
+    <item
-    <item android:drawable="@drawable/progressbar_indeterminate_holo5" android:duration="50" />
+        android:drawable="@drawable/progressbar_indeterminate_holo2"
-    <item android:drawable="@drawable/progressbar_indeterminate_holo6" android:duration="50" />
+        android:duration="50" />
-    <item android:drawable="@drawable/progressbar_indeterminate_holo7" android:duration="50" />
+    <item
-    <item android:drawable="@drawable/progressbar_indeterminate_holo8" android:duration="50" />
+        android:drawable="@drawable/progressbar_indeterminate_holo3"
+        android:duration="50" />
+    <item
+        android:drawable="@drawable/progressbar_indeterminate_holo4"
+        android:duration="50" />
+    <item
+        android:drawable="@drawable/progressbar_indeterminate_holo5"
+        android:duration="50" />
+    <item
+        android:drawable="@drawable/progressbar_indeterminate_holo6"
+        android:duration="50" />
+    <item
+        android:drawable="@drawable/progressbar_indeterminate_holo7"
+        android:duration="50" />
+    <item
+        android:drawable="@drawable/progressbar_indeterminate_holo8"
+        android:duration="50" />
 </animation-list>

src/main/res/drawable/spinner_background_holo_dark.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project
-<!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,11 +14,8 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
+    <item android:drawable="@drawable/spinner_disabled_holo_dark" android:state_enabled="false" />
-          android:drawable="@drawable/spinner_disabled_holo_dark" />
+    <item android:drawable="@drawable/spinner_pressed_holo_dark" android:state_pressed="true" />
-    <item android:state_pressed="true"
+    <item android:drawable="@drawable/spinner_focused_holo_dark" android:state_focused="true" android:state_pressed="false" />
-          android:drawable="@drawable/spinner_pressed_holo_dark" />
-    <item android:state_pressed="false" android:state_focused="true"
-          android:drawable="@drawable/spinner_focused_holo_dark" />
     <item android:drawable="@drawable/spinner_default_holo_dark" />
 </selector>

src/main/res/drawable/tab_indicator_mytracks.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,16 +15,16 @@ limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Non focused states -->
-  <item android:drawable="@drawable/tab_unselected" android:state_focused="false" android:state_pressed="false" android:state_selected="false"/>
+    <item android:drawable="@drawable/tab_unselected" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-  <item android:drawable="@drawable/tab_selected" android:state_focused="false" android:state_pressed="false" android:state_selected="true"/>
+    <item android:drawable="@drawable/tab_selected" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
     <!-- Focused states -->
-  <item android:drawable="@drawable/tab_unselected_focused" android:state_focused="true" android:state_pressed="false" android:state_selected="false"/>
+    <item android:drawable="@drawable/tab_unselected_focused" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-  <item android:drawable="@drawable/tab_selected_focused" android:state_focused="true" android:state_pressed="false" android:state_selected="true"/>
+    <item android:drawable="@drawable/tab_selected_focused" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
     <!-- Pressed -->
     <!-- Non focused states -->
-  <item android:drawable="@drawable/tab_unselected_pressed" android:state_focused="false" android:state_pressed="true" android:state_selected="false"/>
+    <item android:drawable="@drawable/tab_unselected_pressed" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
-  <item android:drawable="@drawable/tab_selected_pressed" android:state_focused="false" android:state_pressed="true" android:state_selected="true"/>
+    <item android:drawable="@drawable/tab_selected_pressed" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
     <!-- Focused states -->
-  <item android:drawable="@drawable/tab_unselected_pressed" android:state_focused="true" android:state_pressed="true" android:state_selected="false"/>
+    <item android:drawable="@drawable/tab_unselected_pressed" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
-  <item android:drawable="@drawable/tab_selected_pressed" android:state_focused="true" android:state_pressed="true" android:state_selected="true"/>
+    <item android:drawable="@drawable/tab_selected_pressed" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
 </selector>

src/main/res/drawable/text_gradient.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
      Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:angle="90"
         android:centerColor="@color/text_gradient_center"

src/main/res/layout-land/stats_content.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,55 +13,66 @@ 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.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Distance, calorie, total time, and moving time -->
     <LinearLayout
-    android:layout_height="wrap_content"
+        android:layout_width="match_parent"
-    android:layout_width="match_parent" >
+        android:layout_height="wrap_content">
+
         <include
             android:id="@+id/stats_distance"
             layout="@layout/stats_large_item" />
+
         <include
             android:id="@+id/stats_calorie"
             layout="@layout/stats_activity_type" />
+
         <View
-      android:layout_height="match_parent"
             android:layout_width="1dp"
+            android:layout_height="match_parent"
             android:visibility="invisible" />
+
         <include
             android:id="@+id/stats_total_time"
             layout="@layout/stats_large_item" />
+
         <include
             android:id="@+id/stats_moving_time"
             layout="@layout/stats_large_item" />
     </LinearLayout>
     <!-- Horizontal line -->
     <View style="@style/StatsHorizontalLine" />
+
     <LinearLayout
-    android:layout_height="wrap_content"
+        android:layout_width="match_parent"
-    android:layout_width="match_parent" >
+        android:layout_height="wrap_content">
+
         <TableLayout
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-      android:layout_weight="1"
+            android:layout_weight="1">
-      android:layout_width="0dp" >
             <!-- Speed and average speed -->
             <LinearLayout
-        android:layout_height="wrap_content"
+                android:layout_width="match_parent"
-        android:layout_width="match_parent" >
+                android:layout_height="wrap_content">
+
                 <include
                     android:id="@+id/stats_speed"
                     layout="@layout/stats_small_item" />
+
                 <include
                     android:id="@+id/stats_average_speed"
                     layout="@layout/stats_small_item" />
             </LinearLayout>
             <!-- Max speed and average moving speed -->
             <LinearLayout
-        android:layout_height="wrap_content"
+                android:layout_width="match_parent"
-        android:layout_width="match_parent" >
+                android:layout_height="wrap_content">
+
                 <include
                     android:id="@+id/stats_max_speed"
                     layout="@layout/stats_small_item" />
+
                 <include
                     android:id="@+id/stats_average_moving_speed"
                     layout="@layout/stats_small_item" />
@@ -70,11 +80,13 @@ limitations under the License.
             <!-- Latitude and longitude -->
             <LinearLayout
                 android:id="@+id/stats_coordinate_container"
-        android:layout_height="wrap_content"
+                android:layout_width="match_parent"
-        android:layout_width="match_parent" >
+                android:layout_height="wrap_content">
+
                 <include
                     android:id="@+id/stats_latitude"
                     layout="@layout/stats_small_item" />
+
                 <include
                     android:id="@+id/stats_longitude"
                     layout="@layout/stats_small_item" />
@@ -82,25 +94,27 @@ limitations under the License.
         </TableLayout>
         <!-- Vertical line -->
         <View
-      android:background="@color/stats_separator"
             android:id="@+id/stats_grade_elevation_separator"
+            android:layout_width="1dp"
             android:layout_height="match_parent"
-      android:layout_width="1dp" />
+            android:background="@color/stats_separator" />
+
         <LinearLayout
             android:id="@+id/stats_grade_elevation_container"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-      android:layout_weight="1"
+            android:layout_weight="1">
-      android:layout_width="0dp" >
             <!-- Grade -->
-      <LinearLayout style="@style/StatsSmallGroupContainer" >
+            <LinearLayout style="@style/StatsSmallGroupContainer">
                 <!-- Grade label -->
                 <TextView
-          android:text="@string/stats_grade"
+                    style="@style/StatsSmallLabel"
-          style="@style/StatsSmallLabel" />
+                    android:text="@string/stats_grade" />
+
                 <TableLayout
-          android:layout_gravity="center"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-          android:layout_width="wrap_content" >
+                    android:layout_gravity="center">
                     <!-- Grade min -->
                     <include
                         android:id="@+id/stats_grade_min"
@@ -112,15 +126,16 @@ limitations under the License.
                 </TableLayout>
             </LinearLayout>
             <!-- Elevation -->
-      <LinearLayout style="@style/StatsSmallGroupContainer" >
+            <LinearLayout style="@style/StatsSmallGroupContainer">
                 <!-- Elevation label -->
                 <TextView
-          android:text="@string/stats_elevation"
+                    style="@style/StatsSmallLabel"
-          style="@style/StatsSmallLabel" />
+                    android:text="@string/stats_elevation" />
+
                 <TableLayout
-          android:layout_gravity="center"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-          android:layout_width="wrap_content" >
+                    android:layout_gravity="center">
                     <!-- Elevation -->
                     <include
                         android:id="@+id/stats_elevation"

src/main/res/layout-land/track_controller.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,57 +13,65 @@ 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.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
     <LinearLayout
-    android:background="@color/track_controller_background"
         android:id="@+id/track_controller_container"
-    android:layout_height="match_parent"
         android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:background="@color/track_controller_background"
         android:orientation="vertical"
         android:paddingLeft="8dp"
-    android:paddingRight="8dp" >
+        android:paddingRight="8dp">
+
         <View
+            android:layout_width="match_parent"
             android:layout_height="0dp"
-      android:layout_weight="1"
+            android:layout_weight="1" />
-      android:layout_width="match_parent" />
+
         <ImageButton
-      android:background="@android:color/transparent"
-      android:contentDescription="@string/image_record"
             android:id="@+id/track_controller_record"
+            android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_weight="10"
-      android:layout_width="wrap_content" />
+            android:background="@android:color/transparent"
+            android:contentDescription="@string/image_record" />
+
         <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="0dp"
-      android:layout_weight="6"
+            android:layout_weight="6">
-      android:layout_width="match_parent" >
+
             <TextView
                 android:id="@+id/track_controller_total_time"
-        android:layout_centerInParent="true"
+                style="@style/TextSmall"
-        android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-        android:textColor="@android:color/white"
+                android:layout_height="wrap_content"
-        style="@style/TextSmall" />
+                android:layout_centerInParent="true"
+                android:textColor="@android:color/white" />
+
             <TextView
                 android:id="@+id/track_controller_status"
+                style="@style/TextMicro"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_above="@id/track_controller_total_time"
                 android:layout_centerHorizontal="true"
-        android:layout_height="wrap_content"
+                android:singleLine="true" />
-        android:layout_width="wrap_content"
-        android:singleLine="true"
-        style="@style/TextMicro" />
         </RelativeLayout>
+
         <ImageButton
-      android:background="@android:color/transparent"
-      android:contentDescription="@string/image_stop"
             android:id="@+id/track_controller_stop"
+            android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="10"
-      android:layout_width="match_parent"
+            android:background="@android:color/transparent"
+            android:contentDescription="@string/image_stop"
             android:src="@drawable/ic_button_stop_disabled" />
+
         <View
+            android:layout_width="match_parent"
             android:layout_height="0dp"
-      android:layout_weight="1"
+            android:layout_weight="1" />
-      android:layout_width="match_parent" />
     </LinearLayout>
 </merge>

src/main/res/layout-land/track_detail.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,18 @@ 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:baselineAligned="false"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-  android:layout_width="match_parent" >
+    android:baselineAligned="false">
+
     <include layout="@layout/track_controller" />
+
     <TabHost
         android:id="@android:id/tabhost"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
-    android:layout_weight="1"
+        android:layout_weight="1">
-    android:layout_width="0dp" >
+
         <include layout="@layout/track_details_tab" />
     </TabHost>
 </LinearLayout>

src/main/res/layout-land/track_list.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,68 +14,79 @@ 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:baselineAligned="false"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-  android:layout_width="match_parent" >
+    android:baselineAligned="false">
+
     <include layout="@layout/track_controller" />
+
     <ListView
         android:id="@+id/track_list"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
-    android:layout_weight="1.0"
+        android:layout_weight="1.0" />
-    android:layout_width="0dp" />
+
     <RelativeLayout
         android:id="@+id/track_list_empty_view"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
-    android:layout_weight="1.0"
+        android:layout_weight="1.0">
-    android:layout_width="0dp" >
+
         <LinearLayout
             android:id="@+id/track_list_arrow_long"
-      android:layout_alignParentLeft="true"
-      android:layout_height="match_parent"
             android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
             android:orientation="vertical"
             android:paddingLeft="12dp"
-      android:paddingRight="16dp" >
+            android:paddingRight="16dp">
+
             <View
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
-        android:layout_weight="1"
+                android:layout_weight="1" />
-        android:layout_width="match_parent" />
+
             <ImageView
-        android:contentDescription="@string/image_arrow"
+                android:layout_width="wrap_content"
                 android:layout_height="0dp"
                 android:layout_weight="10"
-        android:layout_width="wrap_content"
+                android:contentDescription="@string/image_arrow"
                 android:src="@drawable/ic_arrow_long" />
+
             <View
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
-        android:layout_weight="17"
+                android:layout_weight="17" />
-        android:layout_width="match_parent" />
         </LinearLayout>
+
         <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_toRightOf="@id/track_list_arrow_long"
-      android:layout_width="match_parent"
+            android:orientation="vertical">
-      android:orientation="vertical" >
+
             <View
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
-        android:layout_weight="4"
+                android:layout_weight="4" />
-        android:layout_width="match_parent" />
+
             <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
-        android:layout_weight="24"
+                android:layout_weight="24">
-        android:layout_width="match_parent" >
+
                 <TextView
+                    style="@style/TextLarge"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight=".7"
-          android:layout_width="0dp"
                     android:text="@string/track_list_empty_message"
-          android:textColor="@color/list_empty_text"
+                    android:textColor="@color/list_empty_text"></TextView>
-          style="@style/TextLarge" >
+
-        </TextView>
                 <View
+                    android:layout_width="0dp"
                     android:layout_height="match_parent"
-          android:layout_weight=".3"
+                    android:layout_weight=".3" />
-          android:layout_width="0dp" />
             </LinearLayout>
         </LinearLayout>
     </RelativeLayout>

src/main/res/layout/activity_type_preference.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,24 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/ScrollView" >
+    style="@style/ScrollView">
+
     <LinearLayout
-    android:layout_height="wrap_content"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:paddingLeft="8dp"
-    android:paddingRight="8dp"
+        android:paddingTop="16dp"
-    android:paddingTop="16dp" >
+        android:paddingRight="8dp">
+
         <AutoCompleteTextView
-      android:hint="@string/track_edit_activity_type_hint"
             android:id="@+id/activity_type_preference_text_view"
+            style="@style/EditCategory"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-      android:layout_width="0dp"
+            android:hint="@string/track_edit_activity_type_hint" />
-      style="@style/EditCategory" />
+
         <Spinner
             android:id="@+id/activity_type_preference_spinner"
-      android:layout_gravity="bottom"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-      android:layout_width="wrap_content" />
+            android:layout_gravity="bottom" />
     </LinearLayout>
 </ScrollView>

src/main/res/layout/chart.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,21 +14,22 @@ 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="match_parent"
     android:layout_width="match_parent"
-  android:orientation="vertical" >
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
     <LinearLayout
         android:id="@+id/chart_view_layout"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-    android:layout_width="match_parent"
+        android:orientation="vertical"></LinearLayout>
-    android:orientation="vertical" >
+
-  </LinearLayout>
     <ZoomControls
+        android:id="@+id/chart_zoom_controls"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:background="@android:color/white"
         android:gravity="right"
-    android:id="@+id/chart_zoom_controls"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
         android:paddingRight="8dp" />
 </LinearLayout>

src/main/res/layout/choose_activity_list_item.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,36 +14,40 @@ 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:gravity="center_vertical"
-  android:layout_height="wrap_content"
     android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingLeft="16dp"
-  android:paddingRight="16dp" >
+    android:paddingRight="16dp">
+
     <ImageView
-    android:contentDescription="@string/image_application"
         android:id="@+id/choose_activity_list_item_icon"
-    android:layout_height="@android:dimen/app_icon_size"
         android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:contentDescription="@string/image_application"
         android:scaleType="fitCenter" />
+
     <LinearLayout
-    android:gravity="center_vertical"
-    android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-    android:orientation="vertical" >
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
+
         <TextView
             android:id="@+id/choose_activity_list_item_text1"
-      android:layout_height="wrap_content"
+            style="@style/TextChooseActivity"
             android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:maxLines="2"
-      android:paddingLeft="16dp"
+            android:paddingLeft="16dp" />
-      style="@style/TextChooseActivity" />
+
         <TextView
             android:id="@+id/choose_activity_list_item_text2"
-      android:layout_height="wrap_content"
+            style="@style/TextChooseActivity"
             android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:maxLines="2"
-      android:paddingLeft="16dp"
+            android:paddingLeft="16dp" />
-      style="@style/TextChooseActivity" />
     </LinearLayout>
 </LinearLayout>

src/main/res/layout/choose_activity_type.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +14,15 @@ 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="wrap_content"
     android:layout_width="match_parent"
-  android:orientation="vertical" >
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
     <GridView
         android:id="@+id/choose_activity_type_grid_view"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-    android:layout_width="match_parent"
         android:numColumns="4"
         android:padding="4dp"
         android:stretchMode="spacingWidth"

src/main/res/layout/list_item.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,98 +14,104 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="wrap_content"
+    android:layout_width="match_parent"
-  android:layout_width="match_parent" >
+    android:layout_height="wrap_content">
     <!-- Photo -->
     <ImageView
-    android:contentDescription="@string/image_photo_marker"
         android:id="@+id/list_item_photo"
-    android:layout_height="match_parent"
         android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_marginBottom="4dp"
+        android:contentDescription="@string/image_photo_marker"
         android:scaleType="centerCrop" />
+
     <FrameLayout
-    android:layout_height="wrap_content"
+        android:layout_width="match_parent"
-    android:layout_width="match_parent" >
+        android:layout_height="wrap_content">
         <!-- A gradient on top of the text -->
         <ImageView
+            android:id="@+id/list_item_text_gradient"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:alpha=".6"
             android:contentDescription="@string/image_photo_marker"
-      android:id="@+id/list_item_text_gradient"
-      android:layout_height="match_parent"
-      android:layout_width="match_parent"
             android:src="@drawable/text_gradient" />
         <!-- Table 1 -->
         <TableLayout
-      android:layout_height="wrap_content"
             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:minHeight="?android:attr/listPreferredItemHeight"
-      android:paddingBottom="12dp"
-      android:paddingRight="12dp"
             android:paddingTop="8dp"
+            android:paddingRight="12dp"
+            android:paddingBottom="12dp"
             android:shrinkColumns="1"
-      android:stretchColumns="1" >
+            android:stretchColumns="1">
             <!-- Table 1: Row 1 -->
             <TableRow>
                 <!-- Table 1: Row 1: Column 1: (icon) -->
                 <ImageView
-          android:contentDescription="@string/image_track"
                     android:id="@+id/list_item_icon"
-          android:layout_gravity="center_vertical"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:layout_marginLeft="8dp"
                     android:layout_marginRight="8dp"
-          android:layout_width="wrap_content" />
+                    android:contentDescription="@string/image_track" />
                 <!-- Table 1: Row 1: Column 2: (Table 2) -->
                 <TableLayout
-          android:layout_height="wrap_content"
                     android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:shrinkColumns="0"
-          android:stretchColumns="0" >
+                    android:stretchColumns="0">
+
                     <TableRow>
                         <!-- Table 2: Row 1: Column 1: (name) -->
                         <TextView
-              android:ellipsize="end"
                             android:id="@+id/list_item_name"
-              android:layout_gravity="bottom"
+                            style="@style/TextMedium"
                             android:layout_width="match_parent"
-              android:singleLine="true"
+                            android:layout_gravity="bottom"
-              style="@style/TextMedium" />
+                            android:ellipsize="end"
+                            android:singleLine="true" />
                         <!-- Table 2: Row 1: Column 2: (date) -->
                         <TextView
                             android:id="@+id/list_item_date"
                             style="@style/ListItemDate" />
                     </TableRow>
+
                     <TableRow>
                         <!-- Need to match the style set in ListItemUtils.setListItem -->
                         <!-- Table 2: Row 2: Column 1: (shared owner, total time, total distance, and marker count) -->
                         <LinearLayout
-              android:layout_gravity="bottom"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-              android:layout_width="match_parent" >
+                            android:layout_gravity="bottom">
+
                             <TextView
-                android:ellipsize="end"
                                 android:id="@+id/list_item_time_distance"
+                                style="@style/TextSmall"
                                 android:layout_gravity="bottom"
-                android:singleLine="true"
+                                android:ellipsize="end"
-                style="@style/TextSmall" />
+                                android:singleLine="true" />
+
                             <ImageView
-                android:contentDescription="@string/image_marker_count"
                                 android:id="@+id/list_item_marker_count_icon"
-                android:layout_gravity="bottom"
+                                android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                android:layout_marginBottom="1dp"
+                                android:layout_gravity="bottom"
                                 android:layout_marginLeft="2dp"
                                 android:layout_marginRight="2dp"
-                android:layout_width="wrap_content"
+                                android:layout_marginBottom="1dp"
+                                android:contentDescription="@string/image_marker_count"
                                 android:scaleType="centerInside"
                                 android:src="@drawable/ic_menu_insert_marker" />
+
                             <TextView
-                android:ellipsize="end"
                                 android:id="@+id/list_item_marker_count"
+                                style="@style/TextSmall"
                                 android:layout_gravity="bottom"
-                android:singleLine="true"
+                                android:ellipsize="end"
-                style="@style/TextSmall" />
+                                android:singleLine="true" />
                         </LinearLayout>
                         <!-- Table 2: Row 2: Column 2: (time) -->
                         <TextView
@@ -115,20 +120,22 @@ limitations under the License.
                     </TableRow>
                 </TableLayout>
             </TableRow>
+
             <TableRow>
                 <!-- Table 1: Row 2: (category and description) -->
                 <TextView
-          android:ellipsize="end"
                     android:id="@+id/list_item_category_description"
+                    style="@style/TextSmall"
                     android:layout_column="1"
+                    android:ellipsize="end"
                     android:maxLines="2"
-          android:singleLine="false"
+                    android:singleLine="false" />
-          style="@style/TextSmall" />
             </TableRow>
         </TableLayout>
     </FrameLayout>
+
     <View
-    android:layout_height="match_parent"
+        style="@style/ListItem"
         android:layout_width="match_parent"
-    style="@style/ListItem" />
+        android:layout_height="match_parent" />
 </FrameLayout>

src/main/res/layout/marker_detail_activity.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +14,11 @@ 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="match_parent"
+    android:layout_width="match_parent"
-  android:layout_width="match_parent" >
+    android:layout_height="match_parent">
+
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/maker_detail_activity_view_pager"
-    android:layout_height="match_parent"
+        android:layout_width="match_parent"
-    android:layout_width="match_parent" />
+        android:layout_height="match_parent" />
 </LinearLayout>

src/main/res/layout/marker_detail_fragment.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,73 +14,87 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="match_parent"
+    android:layout_width="match_parent"
-  android:layout_width="match_parent" >
+    android:layout_height="match_parent">
+
     <FrameLayout
         android:id="@+id/marker_detail_waypoint"
-    android:layout_height="match_parent"
+        android:layout_width="match_parent"
-    android:layout_width="match_parent" >
+        android:layout_height="match_parent">
+
         <ImageView
+            android:id="@+id/marker_detail_waypoint_photo"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:background="@android:color/black"
             android:contentDescription="@string/image_photo_marker"
-      android:id="@+id/marker_detail_waypoint_photo"
-      android:layout_height="match_parent"
-      android:layout_width="match_parent"
             android:scaleType="fitCenter" />
+
         <FrameLayout
-      android:layout_height="wrap_content"
+            android:layout_width="match_parent"
-      android:layout_width="match_parent" >
+            android:layout_height="wrap_content">
             <!-- A gradient on top of the text -->
             <ImageView
+                android:id="@+id/marker_detail_waypoint_text_gradient"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:alpha=".6"
                 android:contentDescription="@string/image_photo_marker"
-        android:id="@+id/marker_detail_waypoint_text_gradient"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
                 android:src="@drawable/text_gradient" />
+
             <LinearLayout
                 android:id="@+id/marker_detail_waypoint_info"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="80dp"
-        android:layout_width="match_parent"
                 android:orientation="vertical"
-        android:padding="8dp" >
+                android:padding="8dp">
+
                 <TextView
                     android:id="@+id/marker_detail_waypoint_name"
-          android:paddingTop="8dp"
+                    style="@style/TextMedium"
-          style="@style/TextMedium" />
+                    android:paddingTop="8dp" />
+
                 <TextView
                     android:id="@+id/marker_detail_waypoint_category"
                     style="@style/TextSmall" />
+
                 <TextView
                     android:id="@+id/marker_detail_waypoint_description"
                     style="@style/TextSmall" />
+
                 <TextView
                     android:id="@+id/marker_detail_waypoint_location"
                     style="@style/TextSmall" />
             </LinearLayout>
         </FrameLayout>
     </FrameLayout>
+
     <ScrollView
         android:id="@+id/marker_detail_statistics"
-    style="@style/StatsScrollView" >
+        style="@style/StatsScrollView">
+
         <LinearLayout
-      android:layout_height="wrap_content"
             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
-      android:padding="8dp" >
+            android:padding="8dp">
+
             <TextView
                 android:id="@+id/marker_detail_statistics_name"
-        android:paddingTop="8dp"
+                style="@style/TextMedium"
-        style="@style/TextMedium" />
+                android:paddingTop="8dp" />
+
             <TextView
                 android:id="@+id/marker_detail_statistics_location"
                 style="@style/TextSmall" />
+
             <TextView
-        android:paddingBottom="6dp"
+                style="@style/TextSmall"
                 android:paddingTop="4dp"
-        android:text="@string/marker_detail_statistics_title"
+                android:paddingBottom="6dp"
-        style="@style/TextSmall" />
+                android:text="@string/marker_detail_statistics_title" />
+
             <include layout="@layout/stats_content" />
         </LinearLayout>
     </ScrollView>

src/main/res/layout/marker_edit.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,63 +14,77 @@ 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_width="match_parent"
     android:layout_height="match_parent"
-  android:layout_width="match_parent"
+    android:orientation="vertical">
-  android:orientation="vertical" >
+
-  <ScrollView style="@style/ScrollView.WithBottomButtons" >
+    <ScrollView style="@style/ScrollView.WithBottomButtons">
+
         <LinearLayout
-      android:layout_height="wrap_content"
             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
-      android:padding="8dp" >
+            android:padding="8dp">
+
             <TextView
-        android:text="@string/generic_name"
+                style="@style/EditLabel"
-        style="@style/EditLabel" />
+                android:text="@string/generic_name" />
+
             <LinearLayout
                 android:id="@+id/marker_edit_statistics_section"
-        android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-        android:orientation="vertical" >
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
                 <EditText
+                    android:id="@+id/marker_edit_statistics_name"
+                    style="@style/EditNameMarker"
                     android:drawableLeft="@drawable/ic_marker_yellow_pushpin"
                     android:hint="@string/generic_name"
-          android:id="@+id/marker_edit_statistics_name"
+                    android:imeOptions="actionDone" />
-          android:imeOptions="actionDone"
-          style="@style/EditNameMarker" />
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/marker_edit_waypoint_section"
-        android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-        android:orientation="vertical" >
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
                 <EditText
+                    android:id="@+id/marker_edit_waypoint_name"
+                    style="@style/EditNameMarker"
                     android:drawableLeft="@drawable/ic_marker_blue_pushpin"
                     android:hint="@string/generic_name"
-          android:id="@+id/marker_edit_waypoint_name"
+                    android:imeOptions="actionNext" />
-          android:imeOptions="actionNext"
+
-          style="@style/EditNameMarker" />
                 <TextView
-          android:text="@string/marker_edit_marker_type"
+                    style="@style/EditLabel.WithPaddingTop"
-          style="@style/EditLabel.WithPaddingTop" />
+                    android:text="@string/marker_edit_marker_type" />
+
                 <AutoCompleteTextView
-          android:hint="@string/marker_edit_marker_type_hint"
                     android:id="@+id/marker_edit_waypoint_marker_type"
-          android:imeOptions="actionNext"
+                    style="@style/EditCategory"
                     android:layout_width="match_parent"
-          style="@style/EditCategory" />
+                    android:hint="@string/marker_edit_marker_type_hint"
+                    android:imeOptions="actionNext" />
+
                 <TextView
-          android:text="@string/generic_description"
+                    style="@style/EditLabel.WithPaddingTop"
-          style="@style/EditLabel.WithPaddingTop" />
+                    android:text="@string/generic_description" />
+
                 <EditText
-          android:hint="@string/generic_description"
                     android:id="@+id/marker_edit_waypoint_description"
-          android:imeOptions="actionDone"
+                    style="@style/EditDescription"
-          style="@style/EditDescription" />
+                    android:hint="@string/generic_description"
+                    android:imeOptions="actionDone" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
+
     <View style="@style/BottomButtonDivider" />
-  <LinearLayout style="@style/BottomButtonBar" >
+
+    <LinearLayout style="@style/BottomButtonBar">
+
         <include layout="@layout/marker_edit_buttons" />
     </LinearLayout>
 </LinearLayout>

src/main/res/layout/marker_edit_buttons.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,15 +13,16 @@ 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.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- In v14, postive button on the right. -->
     <Button
         android:id="@+id/marker_edit_cancel"
+        style="@style/BottomButton"
         android:layout_gravity="left"
-    android:text="@string/generic_cancel"
+        android:text="@string/generic_cancel" />
-    style="@style/BottomButton" />
+
     <Button
         android:id="@+id/marker_edit_done"
-    android:layout_gravity="right"
+        style="@style/BottomButton"
-    style="@style/BottomButton" />
+        android:layout_gravity="right" />
 </merge>

src/main/res/layout/marker_list.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,16 @@ 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="match_parent"
+    android:layout_width="match_parent"
-  android:layout_width="match_parent" >
+    android:layout_height="match_parent">
+
     <ListView
         android:id="@+id/marker_list"
-    android:layout_height="match_parent"
+        android:layout_width="match_parent"
-    android:layout_width="match_parent" />
+        android:layout_height="match_parent" />
+
     <TextView
         android:id="@+id/marker_list_empty"
-    android:text="@string/marker_list_empty_message"
+        style="@style/ListEmptyTextView"
-    style="@style/ListEmptyTextView" >
+        android:text="@string/marker_list_empty_message"></TextView>
-  </TextView>
 </merge>

src/main/res/layout/search_list.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,16 @@ 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="match_parent"
+    android:layout_width="match_parent"
-  android:layout_width="match_parent" >
+    android:layout_height="match_parent">
+
     <ListView
         android:id="@+id/search_list"
-    android:layout_height="match_parent"
+        android:layout_width="match_parent"
-    android:layout_width="match_parent" />
+        android:layout_height="match_parent" />
+
     <TextView
         android:id="@+id/search_list_empty"
-    android:text="@string/search_list_empty_message"
+        style="@style/ListEmptyTextView"
-    style="@style/ListEmptyTextView" >
+        android:text="@string/search_list_empty_message"></TextView>
-  </TextView>
 </merge>

src/main/res/layout/sensor_state.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,50 +14,58 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/ScrollView" >
+    style="@style/ScrollView">
+
     <LinearLayout
-    android:layout_height="wrap_content"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
-    android:padding="8dp" >
+        android:padding="8dp">
+
         <TextView
-      android:text="@string/menu_sensor_state"
+            style="@style/TextMedium"
-      style="@style/TextMedium" />
+            android:text="@string/menu_sensor_state" />
+
         <TextView
             android:id="@+id/sensor_state"
             style="@style/SensorStateValue" />
         <!-- Last sensor time -->
         <TextView
-      android:text="@string/sensor_state_last_sensor_time"
+            style="@style/TextMedium"
-      style="@style/TextMedium" />
+            android:text="@string/sensor_state_last_sensor_time" />
+
         <TextView
             android:id="@+id/sensor_state_last_sensor_time"
             style="@style/SensorStateValue" />
         <!-- Heart rate -->
         <TextView
-      android:text="@string/sensor_state_heart_rate"
+            style="@style/TextMedium"
-      style="@style/TextMedium" />
+            android:text="@string/sensor_state_heart_rate" />
+
         <TextView
             android:id="@+id/sensor_state_heart_rate"
             style="@style/SensorStateValue" />
         <!-- Cadence -->
         <TextView
-      android:text="@string/sensor_state_cadence"
+            style="@style/TextMedium"
-      style="@style/TextMedium" />
+            android:text="@string/sensor_state_cadence" />
+
         <TextView
             android:id="@+id/sensor_state_cadence"
             style="@style/SensorStateValue" />
         <!-- Power -->
         <TextView
-      android:text="@string/sensor_state_power"
+            style="@style/TextMedium"
-      style="@style/TextMedium" />
+            android:text="@string/sensor_state_power" />
+
         <TextView
             android:id="@+id/sensor_state_power"
             style="@style/SensorStateValue" />
         <!-- Battery level -->
         <TextView
-      android:text="@string/sensor_state_battery"
+            style="@style/TextMedium"
-      style="@style/TextMedium" />
+            android:text="@string/sensor_state_battery" />
+
         <TextView
             android:id="@+id/sensor_state_battery"
             style="@style/SensorStateValue" />

src/main/res/layout/stats.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,11 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/StatsScrollView" >
+    style="@style/StatsScrollView">
+
     <LinearLayout
-    android:layout_height="wrap_content"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical">
+
         <include layout="@layout/stats_content" />
     </LinearLayout>
 </ScrollView>

src/main/res/layout/stats_activity_type.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,18 +14,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"
-  style="@style/StatsLargeItemContainer" >
+    style="@style/StatsLargeItemContainer">
     <!-- Label -->
     <TextView
         android:id="@+id/stats_label"
-    android:text="@string/track_edit_activity_type_hint"
+        style="@style/StatsLargeLabel"
-    style="@style/StatsLargeLabel" />
+        android:text="@string/track_edit_activity_type_hint" />
     <!-- Value container -->
-  <LinearLayout style="@style/StatsLargeValueContainer" >
+    <LinearLayout style="@style/StatsLargeValueContainer">
+
         <Spinner
             android:id="@+id/stats_activity_type_icon"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-      android:layout_marginLeft="4dp"
+            android:layout_marginLeft="4dp" />
-      android:layout_width="wrap_content" />
     </LinearLayout>
 </LinearLayout>

src/main/res/layout/stats_content.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,25 +13,29 @@ 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.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Distance and activity type -->
     <LinearLayout
-    android:layout_height="wrap_content"
+        android:layout_width="match_parent"
-    android:layout_width="match_parent" >
+        android:layout_height="wrap_content">
+
         <include
             android:id="@+id/stats_distance"
             layout="@layout/stats_large_item" />
+
         <include
             android:id="@+id/stats_calorie"
             layout="@layout/stats_activity_type" />
     </LinearLayout>
     <!-- Total time and moving time -->
     <LinearLayout
-    android:layout_height="wrap_content"
+        android:layout_width="match_parent"
-    android:layout_width="match_parent" >
+        android:layout_height="wrap_content">
+
         <include
             android:id="@+id/stats_total_time"
             layout="@layout/stats_large_item" />
+
         <include
             android:id="@+id/stats_moving_time"
             layout="@layout/stats_large_item" />
@@ -41,22 +44,26 @@ limitations under the License.
     <View style="@style/StatsHorizontalLine" />
     <!-- Speed and average speed -->
     <LinearLayout
-    android:layout_height="wrap_content"
+        android:layout_width="match_parent"
-    android:layout_width="match_parent" >
+        android:layout_height="wrap_content">
+
         <include
             android:id="@+id/stats_speed"
             layout="@layout/stats_small_item" />
+
         <include
             android:id="@+id/stats_average_speed"
             layout="@layout/stats_small_item" />
     </LinearLayout>
     <!-- Max speed and average moving speed -->
     <LinearLayout
-    android:layout_height="wrap_content"
+        android:layout_width="match_parent"
-    android:layout_width="match_parent" >
+        android:layout_height="wrap_content">
+
         <include
             android:id="@+id/stats_max_speed"
             layout="@layout/stats_small_item" />
+
         <include
             android:id="@+id/stats_average_moving_speed"
             layout="@layout/stats_small_item" />
@@ -65,20 +72,22 @@ limitations under the License.
     <View
         android:id="@+id/stats_grade_elevation_separator"
         style="@style/StatsHorizontalLine" />
+
     <LinearLayout
         android:id="@+id/stats_grade_elevation_container"
-    android:layout_height="wrap_content"
+        android:layout_width="match_parent"
-    android:layout_width="match_parent" >
+        android:layout_height="wrap_content">
         <!-- Grade -->
-    <LinearLayout style="@style/StatsSmallGroupContainer" >
+        <LinearLayout style="@style/StatsSmallGroupContainer">
             <!-- Grade label -->
             <TextView
-        android:text="@string/stats_grade"
+                style="@style/StatsSmallLabel"
-        style="@style/StatsSmallLabel" />
+                android:text="@string/stats_grade" />
+
             <TableLayout
-        android:layout_gravity="center"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-        android:layout_width="wrap_content" >
+                android:layout_gravity="center">
                 <!-- Grade min -->
                 <include
                     android:id="@+id/stats_grade_min"
@@ -90,15 +99,16 @@ limitations under the License.
             </TableLayout>
         </LinearLayout>
         <!-- Elevation -->
-    <LinearLayout style="@style/StatsSmallGroupContainer" >
+        <LinearLayout style="@style/StatsSmallGroupContainer">
             <!-- Elevation label -->
             <TextView
-        android:text="@string/stats_elevation"
+                style="@style/StatsSmallLabel"
-        style="@style/StatsSmallLabel" />
+                android:text="@string/stats_elevation" />
+
             <TableLayout
-        android:layout_gravity="center"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-        android:layout_width="wrap_content" >
+                android:layout_gravity="center">
                 <!-- Elevation -->
                 <include
                     android:id="@+id/stats_elevation"
@@ -125,11 +135,13 @@ limitations under the License.
     <!-- Latitude and longitude -->
     <LinearLayout
         android:id="@+id/stats_coordinate_container"
-    android:layout_height="wrap_content"
+        android:layout_width="match_parent"
-    android:layout_width="match_parent" >
+        android:layout_height="wrap_content">
+
         <include
             android:id="@+id/stats_latitude"
             layout="@layout/stats_small_item" />
+
         <include
             android:id="@+id/stats_longitude"
             layout="@layout/stats_small_item" />

src/main/res/layout/stats_large_item.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +14,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"
-  style="@style/StatsLargeItemContainer" >
+    style="@style/StatsLargeItemContainer">
     <!-- Label -->
     <TextView
         android:id="@+id/stats_label"
         style="@style/StatsLargeLabel" />
     <!-- Value container -->
-  <LinearLayout style="@style/StatsLargeValueContainer" >
+    <LinearLayout style="@style/StatsLargeValueContainer">
         <!-- Value -->
         <TextView
             android:id="@+id/stats_value"

src/main/res/layout/stats_small_group_item.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <TableRow xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
-  android:layout_width="wrap_content" >
+    android:layout_height="wrap_content">
     <!-- Value container -->
     <LinearLayout
-    android:layout_gravity="right|bottom"
+        style="@style/StatsSmallValueContainer"
-    style="@style/StatsSmallValueContainer" >
+        android:layout_gravity="right|bottom">
         <!-- Value -->
         <TextView
             android:id="@+id/stats_value"
@@ -32,16 +31,17 @@ limitations under the License.
     </LinearLayout>
     <!-- Label container -->
     <LinearLayout
-    android:layout_gravity="left|bottom"
+        style="@style/StatsSmallValueContainer"
-    style="@style/StatsSmallValueContainer" >
+        android:layout_gravity="left|bottom">
+
         <TextView
-      android:visibility="invisible"
+            style="@style/StatsSmallValue"
-      style="@style/StatsSmallValue" />
+            android:visibility="invisible" />
         <!-- Label -->
         <TextView
             android:id="@+id/stats_label"
+            style="@style/StatsSmallLabel"
             android:layout_gravity="bottom"
-      android:paddingLeft="8dp"
+            android:paddingLeft="8dp" />
-      style="@style/StatsSmallLabel" />
     </LinearLayout>
 </TableRow>

src/main/res/layout/stats_small_item.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +14,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"
-  style="@style/StatsSmallItemContainer" >
+    style="@style/StatsSmallItemContainer">
     <!-- Label -->
     <TextView
         android:id="@+id/stats_label"
         style="@style/StatsSmallLabel" />
     <!-- Value container -->
-  <LinearLayout style="@style/StatsSmallValueContainer" >
+    <LinearLayout style="@style/StatsSmallValueContainer">
         <!-- Value -->
         <TextView
             android:id="@+id/stats_value"

src/main/res/layout/stats_tiny_item.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +14,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"
-  style="@style/StatsSmallItemContainer" >
+    style="@style/StatsSmallItemContainer">
     <!-- Label -->
     <TextView
         android:id="@+id/stats_label"
         style="@style/StatsSmallLabel" />
     <!-- Value container -->
-  <LinearLayout style="@style/StatsSmallValueContainer" >
+    <LinearLayout style="@style/StatsSmallValueContainer">
         <!-- Value -->
         <TextView
             android:id="@+id/stats_value"

src/main/res/layout/track_controller.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,57 +13,65 @@ 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.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
     <LinearLayout
-    android:background="@color/track_controller_background"
         android:id="@+id/track_controller_container"
-    android:layout_height="wrap_content"
         android:layout_width="match_parent"
-    android:paddingBottom="8dp"
+        android:layout_height="wrap_content"
-    android:paddingTop="8dp" >
+        android:background="@color/track_controller_background"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
+
         <View
+            android:layout_width="0dp"
             android:layout_height="match_parent"
-      android:layout_weight="1"
+            android:layout_weight="1" />
-      android:layout_width="0dp" />
+
         <ImageButton
-      android:background="@android:color/transparent"
-      android:contentDescription="@string/image_record"
             android:id="@+id/track_controller_record"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="10"
-      android:layout_width="0dp" />
+            android:background="@android:color/transparent"
+            android:contentDescription="@string/image_record" />
+
         <RelativeLayout
+            android:layout_width="0dp"
             android:layout_height="match_parent"
-      android:layout_weight="6"
+            android:layout_weight="6">
-      android:layout_width="0dp" >
+
             <TextView
                 android:id="@+id/track_controller_total_time"
+                style="@style/TextSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
-        android:layout_height="wrap_content"
+                android:textColor="@android:color/white" />
-        android:layout_width="wrap_content"
+
-        android:textColor="@android:color/white"
-        style="@style/TextSmall" />
             <TextView
                 android:id="@+id/track_controller_status"
+                style="@style/TextMicro"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_above="@id/track_controller_total_time"
                 android:layout_alignParentLeft="true"
-        android:layout_height="wrap_content"
+                android:singleLine="true" />
-        android:layout_width="wrap_content"
-        android:singleLine="true"
-        style="@style/TextMicro" />
         </RelativeLayout>
+
         <ImageButton
-      android:background="@android:color/transparent"
-      android:contentDescription="@string/image_stop"
             android:id="@+id/track_controller_stop"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="10"
-      android:layout_width="0dp"
+            android:background="@android:color/transparent"
+            android:contentDescription="@string/image_stop"
             android:src="@drawable/ic_button_stop_disabled" />
+
         <View
+            android:layout_width="0dp"
             android:layout_height="match_parent"
-      android:layout_weight="1"
+            android:layout_weight="1" />
-      android:layout_width="0dp" />
     </LinearLayout>
 </merge>

src/main/res/layout/track_detail.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,18 @@ 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="match_parent"
     android:layout_width="match_parent"
-  android:orientation="vertical" >
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
     <TabHost
         android:id="@android:id/tabhost"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
-    android:layout_weight="1"
+        android:layout_weight="1">
-    android:layout_width="match_parent" >
+
         <include layout="@layout/track_details_tab" />
     </TabHost>
+
     <include layout="@layout/track_controller" />
 </LinearLayout>

src/main/res/layout/track_details_tab.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,25 +13,29 @@ 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.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
     <LinearLayout
-    android:layout_height="match_parent"
         android:layout_width="match_parent"
-    android:orientation="vertical" >
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
         <TabWidget
             android:id="@android:id/tabs"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-      android:layout_weight="0"
+            android:layout_weight="0" />
-      android:layout_width="match_parent" />
+
         <FrameLayout
             android:id="@android:id/tabcontent"
+            android:layout_width="0dp"
             android:layout_height="0dp"
-      android:layout_weight="0"
+            android:layout_weight="0" />
-      android:layout_width="0dp" />
+
         <androidx.viewpager.widget.ViewPager
             android:id="@+id/pager"
+            android:layout_width="match_parent"
             android:layout_height="0dp"
-      android:layout_weight="1"
+            android:layout_weight="1" />
-      android:layout_width="match_parent" />
     </LinearLayout>
 </merge>

src/main/res/layout/track_edit.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,56 +14,69 @@ 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_width="match_parent"
     android:layout_height="match_parent"
-  android:layout_width="match_parent"
+    android:orientation="vertical">
-  android:orientation="vertical" >
+
-  <ScrollView style="@style/ScrollView.WithBottomButtons" >
+    <ScrollView style="@style/ScrollView.WithBottomButtons">
+
         <LinearLayout
-      android:layout_height="wrap_content"
             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
-      android:padding="8dp" >
+            android:padding="8dp">
+
             <TextView
-        android:text="@string/generic_name"
+                style="@style/EditLabel"
-        style="@style/EditLabel" />
+                android:text="@string/generic_name" />
+
             <EditText
-        android:hint="@string/generic_name"
                 android:id="@+id/track_edit_name"
-        android:imeOptions="actionNext"
+                style="@style/EditNameTrack"
-        style="@style/EditNameTrack" />
+                android:hint="@string/generic_name"
+                android:imeOptions="actionNext" />
+
             <TextView
                 android:id="@+id/track_edit_activity_type_label"
-        android:text="@string/track_edit_activity_type"
+                style="@style/EditLabel.WithPaddingTop"
-        style="@style/EditLabel.WithPaddingTop" />
+                android:text="@string/track_edit_activity_type" />
+
             <LinearLayout
-        android:layout_height="wrap_content"
+                android:layout_width="match_parent"
-        android:layout_width="match_parent" >
+                android:layout_height="wrap_content">
+
                 <AutoCompleteTextView
-          android:hint="@string/track_edit_activity_type_hint"
                     android:id="@+id/track_edit_activity_type"
-          android:imeOptions="actionNext"
+                    style="@style/EditCategory"
+                    android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-          android:layout_width="0dp"
+                    android:hint="@string/track_edit_activity_type_hint"
-          style="@style/EditCategory" />
+                    android:imeOptions="actionNext" />
+
                 <Spinner
                     android:id="@+id/track_edit_activity_type_icon"
-          android:layout_gravity="bottom"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-          android:layout_width="wrap_content" />
+                    android:layout_gravity="bottom" />
             </LinearLayout>
+
             <TextView
-        android:text="@string/generic_description"
+                style="@style/EditLabel.WithPaddingTop"
-        style="@style/EditLabel.WithPaddingTop" />
+                android:text="@string/generic_description" />
+
             <EditText
-        android:hint="@string/generic_description"
                 android:id="@+id/track_edit_description"
-        android:imeOptions="actionDone"
+                style="@style/EditDescription"
-        style="@style/EditDescription" />
+                android:hint="@string/generic_description"
+                android:imeOptions="actionDone" />
         </LinearLayout>
     </ScrollView>
+
     <View style="@style/BottomButtonDivider" />
-  <LinearLayout style="@style/BottomButtonBar" >
+
+    <LinearLayout style="@style/BottomButtonBar">
+
         <include layout="@layout/track_edit_buttons" />
     </LinearLayout>
 </LinearLayout>

src/main/res/layout/track_edit_buttons.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,16 +13,17 @@ 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.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- In v14, postive button on the right. -->
     <Button
         android:id="@+id/track_edit_cancel"
+        style="@style/BottomButton"
         android:layout_gravity="left"
-    android:text="@string/generic_cancel"
+        android:text="@string/generic_cancel" />
-    style="@style/BottomButton" />
+
     <Button
         android:id="@+id/track_edit_save"
+        style="@style/BottomButton"
         android:layout_gravity="right"
-    android:text="@string/generic_save"
+        android:text="@string/generic_save" />
-    style="@style/BottomButton" />
 </merge>

src/main/res/layout/track_list.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,63 +14,73 @@ 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="match_parent"
     android:layout_width="match_parent"
-  android:orientation="vertical" >
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
     <ListView
         android:id="@+id/track_list"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
-    android:layout_weight="1.0"
+        android:layout_weight="1.0" />
-    android:layout_width="match_parent" />
+
     <RelativeLayout
         android:id="@+id/track_list_empty_view"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
-    android:layout_weight="1.0"
+        android:layout_weight="1.0">
-    android:layout_width="match_parent" >
+
         <LinearLayout
             android:id="@+id/track_list_arrow_long"
-      android:layout_alignParentBottom="true"
-      android:layout_height="wrap_content"
             android:layout_width="match_parent"
-      android:paddingBottom="12dp"
+            android:layout_height="wrap_content"
-      android:paddingTop="16dp" >
+            android:layout_alignParentBottom="true"
+            android:paddingTop="16dp"
+            android:paddingBottom="12dp">
+
             <View
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-        android:layout_weight="1"
+                android:layout_weight="1" />
-        android:layout_width="0dp" />
+
             <ImageView
-        android:contentDescription="@string/image_arrow"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="10"
-        android:layout_width="0dp"
+                android:contentDescription="@string/image_arrow"
                 android:src="@drawable/ic_arrow_long" />
+
             <View
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-        android:layout_weight="17"
+                android:layout_weight="17" />
-        android:layout_width="0dp" />
         </LinearLayout>
+
         <LinearLayout
-      android:layout_above="@id/track_list_arrow_long"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-      android:layout_width="match_parent" >
+            android:layout_above="@id/track_list_arrow_long">
+
             <View
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-        android:layout_weight="5"
+                android:layout_weight="5" />
-        android:layout_width="0dp" />
+
             <TextView
-        android:gravity="left"
+                style="@style/TextLarge"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="22"
-        android:layout_width="0dp"
+                android:gravity="left"
                 android:text="@string/track_list_empty_message"
-        android:textColor="@color/list_empty_text"
+                android:textColor="@color/list_empty_text"></TextView>
-        style="@style/TextLarge" >
+
-      </TextView>
             <View
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-        android:layout_weight="1"
+                android:layout_weight="1" />
-        android:layout_width="0dp" />
         </LinearLayout>
     </RelativeLayout>
+
     <include layout="@layout/track_controller" />
 </LinearLayout>

src/main/res/layout/track_widget_4x1.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,41 +14,50 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/TrackWidgetBoundingBox" >
+    style="@style/TrackWidgetBoundingBox">
     <!-- android:orientation="horizontal", override from the style -->
     <LinearLayout
+        style="@style/TrackWidgetFrame"
         android:orientation="horizontal"
-    android:paddingBottom="4dp"
         android:paddingTop="4dp"
-    style="@style/TrackWidgetFrame" >
+        android:paddingBottom="4dp">
+
         <LinearLayout
-      android:layout_weight="1"
+            style="@style/TrackWidgetVerticalSpacer"
-      style="@style/TrackWidgetVerticalSpacer" />
+            android:layout_weight="1" />
+
         <ImageButton
-      android:contentDescription="@string/image_record"
             android:id="@+id/track_widget_record_button"
-      android:src="@drawable/button_record"
+            style="@style/TrackWidgetButton"
-      style="@style/TrackWidgetButton" />
+            android:contentDescription="@string/image_record"
+            android:src="@drawable/button_record" />
+
         <LinearLayout
             android:id="@+id/track_widget_stats_container"
+            style="@style/TrackWidgetStatsContainer"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="18"
-      android:layout_width="0dp"
+            android:padding="0dp">
-      android:padding="0dp"
+
-      style="@style/TrackWidgetStatsContainer" >
+            <LinearLayout style="@style/TrackWidgetStatsSection">
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
                 <!-- item1 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer" >
+                <LinearLayout style="@style/TrackWidgetItemContainer">
+
                     <TextView
                         android:id="@+id/track_widget_item1_label"
                         style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer" >
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer">
+
                         <TextView
                             android:id="@+id/track_widget_item1_value"
                             style="@style/TrackWidgetValue" />
+
                         <TextView
                             android:id="@+id/track_widget_item1_unit"
                             style="@style/TrackWidgetUnit" />
+
                         <Chronometer
                             android:id="@+id/track_widget_item1_chronometer"
                             style="@style/TrackWidgetValue" />
@@ -58,31 +66,40 @@ limitations under the License.
             </LinearLayout>
             <!-- horizontal separator -->
             <LinearLayout
-        android:baselineAligned="false"
+                style="@style/TrackWidgetHorizontalSeparator"
-        style="@style/TrackWidgetHorizontalSeparator" >
+                android:baselineAligned="false">
+
                 <LinearLayout
-          android:layout_weight="1"
+                    style="@style/TrackWidgetHorizontalSpacer"
-          style="@style/TrackWidgetHorizontalSpacer" />
+                    android:layout_weight="1" />
+
                 <LinearLayout
-          android:layout_weight="38"
+                    style="@style/TrackWidgetHorizontalLine"
-          style="@style/TrackWidgetHorizontalLine" />
+                    android:layout_weight="38" />
+
                 <LinearLayout
-          android:layout_weight="1"
+                    style="@style/TrackWidgetHorizontalSpacer"
-          style="@style/TrackWidgetHorizontalSpacer" />
+                    android:layout_weight="1" />
             </LinearLayout>
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
+
-        <LinearLayout style="@style/TrackWidgetItemContainer" >
+            <LinearLayout style="@style/TrackWidgetStatsSection">
+
+                <LinearLayout style="@style/TrackWidgetItemContainer">
                     <!-- item2 -->
                     <TextView
                         android:id="@+id/track_widget_item2_label"
                         style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer" >
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer">
+
                         <TextView
                             android:id="@+id/track_widget_item2_value"
                             style="@style/TrackWidgetValue" />
+
                         <TextView
                             android:id="@+id/track_widget_item2_unit"
                             style="@style/TrackWidgetUnit" />
+
                         <Chronometer
                             android:id="@+id/track_widget_item2_chronometer"
                             style="@style/TrackWidgetValue" />
@@ -90,16 +107,19 @@ limitations under the License.
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
+
         <ImageButton
-      android:contentDescription="@string/image_stop"
             android:id="@+id/track_widget_stop_button"
-      android:src="@drawable/ic_button_stop_disabled"
+            style="@style/TrackWidgetButton"
-      style="@style/TrackWidgetButton" />
+            android:contentDescription="@string/image_stop"
+            android:src="@drawable/ic_button_stop_disabled" />
+
         <LinearLayout
-      android:layout_weight="1"
+            style="@style/TrackWidgetVerticalSpacer"
-      style="@style/TrackWidgetVerticalSpacer" />
+            android:layout_weight="1" />
     </LinearLayout>
+
     <ImageView
-    android:contentDescription="@string/image_my_tracks_logo"
+        style="@style/TrackWidgetLogo"
-    style="@style/TrackWidgetLogo" />
+        android:contentDescription="@string/image_my_tracks_logo" />
 </RelativeLayout>

src/main/res/layout/track_widget_4x2.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,28 +14,36 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/TrackWidgetBoundingBox" >
+    style="@style/TrackWidgetBoundingBox">
+
     <LinearLayout
-    android:baselineAligned="false"
+        style="@style/TrackWidgetFrame"
-    style="@style/TrackWidgetFrame" >
+        android:baselineAligned="false">
+
         <LinearLayout
-      android:baselineAligned="false"
             android:id="@+id/track_widget_stats_container"
+            style="@style/TrackWidgetStatsContainer"
             android:layout_weight="1"
-      style="@style/TrackWidgetStatsContainer" >
+            android:baselineAligned="false">
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
                 <!-- item1 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x2" >
+                <LinearLayout style="@style/TrackWidgetItemContainer4x2">
+
                     <TextView
                         android:id="@+id/track_widget_item1_label"
                         style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer" >
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer">
+
                         <TextView
                             android:id="@+id/track_widget_item1_value"
                             style="@style/TrackWidgetValue" />
+
                         <TextView
                             android:id="@+id/track_widget_item1_unit"
                             style="@style/TrackWidgetUnit" />
+
                         <Chronometer
                             android:id="@+id/track_widget_item1_chronometer"
                             style="@style/TrackWidgetValue" />
@@ -44,27 +51,34 @@ limitations under the License.
                 </LinearLayout>
                 <!-- vertical separator -->
                 <LinearLayout
-          android:baselineAligned="false"
+                    style="@style/TrackWidgetVerticalSeparator"
-          style="@style/TrackWidgetVerticalSeparator" >
+                    android:baselineAligned="false">
+
                     <LinearLayout
-            android:layout_weight="2"
+                        style="@style/TrackWidgetVerticalSpacer"
-            style="@style/TrackWidgetVerticalSpacer" />
+                        android:layout_weight="2" />
+
                     <LinearLayout
-            android:layout_weight="1"
+                        style="@style/TrackWidgetVerticalLine"
-            style="@style/TrackWidgetVerticalLine" />
+                        android:layout_weight="1" />
                 </LinearLayout>
                 <!-- item3 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x2" >
+                <LinearLayout style="@style/TrackWidgetItemContainer4x2">
+
                     <TextView
                         android:id="@+id/track_widget_item3_label"
                         style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer" >
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer">
+
                         <TextView
                             android:id="@+id/track_widget_item3_value"
                             style="@style/TrackWidgetValue" />
+
                         <TextView
                             android:id="@+id/track_widget_item3_unit"
                             style="@style/TrackWidgetUnit" />
+
                         <Chronometer
                             android:id="@+id/track_widget_item3_chronometer"
                             style="@style/TrackWidgetValue" />
@@ -73,31 +87,40 @@ limitations under the License.
             </LinearLayout>
             <!-- horizontal separator -->
             <LinearLayout
-        android:baselineAligned="false"
+                style="@style/TrackWidgetHorizontalSeparator"
-        style="@style/TrackWidgetHorizontalSeparator" >
+                android:baselineAligned="false">
+
                 <LinearLayout
-          android:layout_weight="1"
+                    style="@style/TrackWidgetHorizontalSpacer"
-          style="@style/TrackWidgetHorizontalSpacer" />
+                    android:layout_weight="1" />
+
                 <LinearLayout
-          android:layout_weight="38"
+                    style="@style/TrackWidgetHorizontalLine"
-          style="@style/TrackWidgetHorizontalLine" />
+                    android:layout_weight="38" />
+
                 <LinearLayout
-          android:layout_weight="1"
+                    style="@style/TrackWidgetHorizontalSpacer"
-          style="@style/TrackWidgetHorizontalSpacer" />
+                    android:layout_weight="1" />
             </LinearLayout>
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
                 <!-- item2 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x2" >
+                <LinearLayout style="@style/TrackWidgetItemContainer4x2">
+
                     <TextView
                         android:id="@+id/track_widget_item2_label"
                         style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer" >
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer">
+
                         <TextView
                             android:id="@+id/track_widget_item2_value"
                             style="@style/TrackWidgetValue" />
+
                         <TextView
                             android:id="@+id/track_widget_item2_unit"
                             style="@style/TrackWidgetUnit" />
+
                         <Chronometer
                             android:id="@+id/track_widget_item2_chronometer"
                             style="@style/TrackWidgetValue" />
@@ -105,27 +128,34 @@ limitations under the License.
                 </LinearLayout>
                 <!-- vertical separator -->
                 <LinearLayout
-          android:baselineAligned="false"
+                    style="@style/TrackWidgetVerticalSeparator"
-          style="@style/TrackWidgetVerticalSeparator" >
+                    android:baselineAligned="false">
+
                     <LinearLayout
-            android:layout_weight="1"
+                        style="@style/TrackWidgetVerticalLine"
-            style="@style/TrackWidgetVerticalLine" />
+                        android:layout_weight="1" />
+
                     <LinearLayout
-            android:layout_weight="2"
+                        style="@style/TrackWidgetVerticalSpacer"
-            style="@style/TrackWidgetVerticalSpacer" />
+                        android:layout_weight="2" />
                 </LinearLayout>
                 <!-- item4 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x2" >
+                <LinearLayout style="@style/TrackWidgetItemContainer4x2">
+
                     <TextView
                         android:id="@+id/track_widget_item4_label"
                         style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer" >
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer">
+
                         <TextView
                             android:id="@+id/track_widget_item4_value"
                             style="@style/TrackWidgetValue" />
+
                         <TextView
                             android:id="@+id/track_widget_item4_unit"
                             style="@style/TrackWidgetUnit" />
+
                         <Chronometer
                             android:id="@+id/track_widget_item4_chronometer"
                             style="@style/TrackWidgetValue" />
@@ -133,29 +163,36 @@ limitations under the License.
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    <LinearLayout style="@style/TrackWidgetButtonContainer" >
+
+        <LinearLayout style="@style/TrackWidgetButtonContainer">
+
             <LinearLayout
-        android:layout_weight="1"
+                style="@style/TrackWidgetVerticalSpacer"
-        style="@style/TrackWidgetVerticalSpacer" />
+                android:layout_weight="1" />
+
             <ImageButton
-        android:contentDescription="@string/image_record"
                 android:id="@+id/track_widget_record_button"
-        android:src="@drawable/button_record"      
+                style="@style/TrackWidgetButton"
-        style="@style/TrackWidgetButton" />
+                android:contentDescription="@string/image_record"
+                android:src="@drawable/button_record" />
+
             <TextView
                 android:id="@+id/track_widget_record_status"
                 style="@style/TrackWidgetRecordStatus" />
+
             <ImageButton
-        android:contentDescription="@string/image_stop"
                 android:id="@+id/track_widget_stop_button"
-        android:src="@drawable/ic_button_stop_disabled"
+                style="@style/TrackWidgetButton"
-        style="@style/TrackWidgetButton" />
+                android:contentDescription="@string/image_stop"
+                android:src="@drawable/ic_button_stop_disabled" />
+
             <LinearLayout
-        android:layout_weight="1"
+                style="@style/TrackWidgetVerticalSpacer"
-        style="@style/TrackWidgetVerticalSpacer" />
+                android:layout_weight="1" />
         </LinearLayout>
     </LinearLayout>
+
     <ImageView
-    android:contentDescription="@string/image_my_tracks_logo"
+        style="@style/TrackWidgetLogo"
-    style="@style/TrackWidgetLogo" />
+        android:contentDescription="@string/image_my_tracks_logo" />
 </RelativeLayout>

src/main/res/layout/track_widget_4x3.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,28 +14,36 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/TrackWidgetBoundingBox" >
+    style="@style/TrackWidgetBoundingBox">
+
     <LinearLayout
-    android:baselineAligned="false"
+        style="@style/TrackWidgetFrame"
-    style="@style/TrackWidgetFrame" >
+        android:baselineAligned="false">
+
         <LinearLayout
-      android:baselineAligned="false"
             android:id="@+id/track_widget_stats_container"
+            style="@style/TrackWidgetStatsContainer"
             android:layout_weight="2"
-      style="@style/TrackWidgetStatsContainer" >
+            android:baselineAligned="false">
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
                 <!-- item1 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
+                <LinearLayout style="@style/TrackWidgetItemContainer4x3">
+
                     <TextView
                         android:id="@+id/track_widget_item1_label"
                         style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
                         <TextView
                             android:id="@+id/track_widget_item1_value"
                             style="@style/TrackWidgetValue4x3" />
+
                         <TextView
                             android:id="@+id/track_widget_item1_unit"
                             style="@style/TrackWidgetUnit4x3" />
+
                         <Chronometer
                             android:id="@+id/track_widget_item1_chronometer"
                             style="@style/TrackWidgetValue4x3" />
@@ -44,27 +51,34 @@ limitations under the License.
                 </LinearLayout>
                 <!-- vertical separator -->
                 <LinearLayout
-          android:baselineAligned="false"
+                    style="@style/TrackWidgetVerticalSeparator"
-          style="@style/TrackWidgetVerticalSeparator" >
+                    android:baselineAligned="false">
+
                     <LinearLayout
-            android:layout_weight="2"
+                        style="@style/TrackWidgetVerticalSpacer"
-            style="@style/TrackWidgetVerticalSpacer" />
+                        android:layout_weight="2" />
+
                     <LinearLayout
-            android:layout_weight="1"
+                        style="@style/TrackWidgetVerticalLine"
-            style="@style/TrackWidgetVerticalLine" />
+                        android:layout_weight="1" />
                 </LinearLayout>
                 <!-- item3 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
+                <LinearLayout style="@style/TrackWidgetItemContainer4x3">
+
                     <TextView
                         android:id="@+id/track_widget_item3_label"
                         style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
                         <TextView
                             android:id="@+id/track_widget_item3_value"
                             style="@style/TrackWidgetValue4x3" />
+
                         <TextView
                             android:id="@+id/track_widget_item3_unit"
                             style="@style/TrackWidgetUnit4x3" />
+
                         <Chronometer
                             android:id="@+id/track_widget_item3_chronometer"
                             style="@style/TrackWidgetValue4x3" />
@@ -73,31 +87,40 @@ limitations under the License.
             </LinearLayout>
             <!-- horizontal separator -->
             <LinearLayout
-        android:baselineAligned="false"
+                style="@style/TrackWidgetHorizontalSeparator"
-        style="@style/TrackWidgetHorizontalSeparator" >
+                android:baselineAligned="false">
+
                 <LinearLayout
-          android:layout_weight="1"
+                    style="@style/TrackWidgetHorizontalSpacer"
-          style="@style/TrackWidgetHorizontalSpacer" />
+                    android:layout_weight="1" />
+
                 <LinearLayout
-          android:layout_weight="38"
+                    style="@style/TrackWidgetHorizontalLine"
-          style="@style/TrackWidgetHorizontalLine" />
+                    android:layout_weight="38" />
+
                 <LinearLayout
-          android:layout_weight="1"
+                    style="@style/TrackWidgetHorizontalSpacer"
-          style="@style/TrackWidgetHorizontalSpacer" />
+                    android:layout_weight="1" />
             </LinearLayout>
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
                 <!-- item2 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
+                <LinearLayout style="@style/TrackWidgetItemContainer4x3">
+
                     <TextView
                         android:id="@+id/track_widget_item2_label"
                         style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
                         <TextView
                             android:id="@+id/track_widget_item2_value"
                             style="@style/TrackWidgetValue4x3" />
+
                         <TextView
                             android:id="@+id/track_widget_item2_unit"
                             style="@style/TrackWidgetUnit4x3" />
+
                         <Chronometer
                             android:id="@+id/track_widget_item2_chronometer"
                             style="@style/TrackWidgetValue4x3" />
@@ -105,27 +128,34 @@ limitations under the License.
                 </LinearLayout>
                 <!-- vertical separator -->
                 <LinearLayout
-          android:baselineAligned="false"
+                    style="@style/TrackWidgetVerticalSeparator"
-          style="@style/TrackWidgetVerticalSeparator" >
+                    android:baselineAligned="false">
+
                     <LinearLayout
-            android:layout_weight="1"
+                        style="@style/TrackWidgetVerticalLine"
-            style="@style/TrackWidgetVerticalLine" />
+                        android:layout_weight="1" />
+
                     <LinearLayout
-            android:layout_weight="2"
+                        style="@style/TrackWidgetVerticalSpacer"
-            style="@style/TrackWidgetVerticalSpacer" />
+                        android:layout_weight="2" />
                 </LinearLayout>
                 <!-- item4 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
+                <LinearLayout style="@style/TrackWidgetItemContainer4x3">
+
                     <TextView
                         android:id="@+id/track_widget_item4_label"
                         style="@style/TrackWidgetLabel" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
                         <TextView
                             android:id="@+id/track_widget_item4_value"
                             style="@style/TrackWidgetValue4x3" />
+
                         <TextView
                             android:id="@+id/track_widget_item4_unit"
                             style="@style/TrackWidgetUnit4x3" />
+
                         <Chronometer
                             android:id="@+id/track_widget_item4_chronometer"
                             style="@style/TrackWidgetValue4x3" />
@@ -133,29 +163,36 @@ limitations under the License.
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    <LinearLayout style="@style/TrackWidgetButtonContainer" >
+
+        <LinearLayout style="@style/TrackWidgetButtonContainer">
+
             <LinearLayout
-        android:layout_weight="1"
+                style="@style/TrackWidgetVerticalSpacer"
-        style="@style/TrackWidgetVerticalSpacer" />
+                android:layout_weight="1" />
+
             <ImageButton
-        android:contentDescription="@string/image_record"
                 android:id="@+id/track_widget_record_button"
-        android:src="@drawable/button_record"      
+                style="@style/TrackWidgetButton"
-        style="@style/TrackWidgetButton" />
+                android:contentDescription="@string/image_record"
+                android:src="@drawable/button_record" />
+
             <TextView
                 android:id="@+id/track_widget_record_status"
                 style="@style/TrackWidgetRecordStatus" />
+
             <ImageButton
-        android:contentDescription="@string/image_stop"
                 android:id="@+id/track_widget_stop_button"
-        android:src="@drawable/ic_button_stop_disabled"
+                style="@style/TrackWidgetButton"
-        style="@style/TrackWidgetButton" />
+                android:contentDescription="@string/image_stop"
+                android:src="@drawable/ic_button_stop_disabled" />
+
             <LinearLayout
-        android:layout_weight="1"
+                style="@style/TrackWidgetVerticalSpacer"
-        style="@style/TrackWidgetVerticalSpacer" />
+                android:layout_weight="1" />
         </LinearLayout>
     </LinearLayout>
+
     <ImageView
-    android:contentDescription="@string/image_my_tracks_logo"
+        style="@style/TrackWidgetLogo"
-    style="@style/TrackWidgetLogo" />
+        android:contentDescription="@string/image_my_tracks_logo" />
 </RelativeLayout>

src/main/res/layout/track_widget_4x4.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,28 +14,36 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/TrackWidgetBoundingBox" >
+    style="@style/TrackWidgetBoundingBox">
+
     <LinearLayout
-    android:baselineAligned="false"
+        style="@style/TrackWidgetFrame"
-    style="@style/TrackWidgetFrame" >
+        android:baselineAligned="false">
+
         <LinearLayout
-      android:baselineAligned="false"
             android:id="@+id/track_widget_stats_container"
+            style="@style/TrackWidgetStatsContainer"
             android:layout_weight="3"
-      style="@style/TrackWidgetStatsContainer" >
+            android:baselineAligned="false">
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
                 <!-- item1 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x4" >
+                <LinearLayout style="@style/TrackWidgetItemContainer4x4">
+
                     <TextView
                         android:id="@+id/track_widget_item1_label"
                         style="@style/TrackWidgetLabel4x4" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
                         <TextView
                             android:id="@+id/track_widget_item1_value"
                             style="@style/TrackWidgetValue4x4" />
+
                         <TextView
                             android:id="@+id/track_widget_item1_unit"
                             style="@style/TrackWidgetUnit4x4" />
+
                         <Chronometer
                             android:id="@+id/track_widget_item1_chronometer"
                             style="@style/TrackWidgetValue4x4" />
@@ -45,63 +52,82 @@ limitations under the License.
             </LinearLayout>
             <!-- horizontal separator -->
             <LinearLayout
-        android:baselineAligned="false"
+                style="@style/TrackWidgetHorizontalSeparator"
-        style="@style/TrackWidgetHorizontalSeparator" >
+                android:baselineAligned="false">
+
                 <LinearLayout
-          android:layout_weight="1"
+                    style="@style/TrackWidgetHorizontalSpacer"
-          style="@style/TrackWidgetHorizontalSpacer" />
+                    android:layout_weight="1" />
+
                 <LinearLayout
-          android:layout_weight="4"
+                    style="@style/TrackWidgetHorizontalLine"
-          style="@style/TrackWidgetHorizontalLine" />
+                    android:layout_weight="4" />
+
                 <LinearLayout
-          android:layout_weight="1"
+                    style="@style/TrackWidgetHorizontalSpacer"
-          style="@style/TrackWidgetHorizontalSpacer" />
+                    android:layout_weight="1" />
             </LinearLayout>
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
                 <!-- item3 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x4" >
+                <LinearLayout style="@style/TrackWidgetItemContainer4x4">
+
                     <TextView
                         android:id="@+id/track_widget_item3_label"
                         style="@style/TrackWidgetLabel4x4" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
                         <TextView
                             android:id="@+id/track_widget_item3_value"
                             style="@style/TrackWidgetValue4x4" />
+
                         <TextView
                             android:id="@+id/track_widget_item3_unit"
                             style="@style/TrackWidgetUnit4x4" />
+
                         <Chronometer
                             android:id="@+id/track_widget_item3_chronometer"
                             style="@style/TrackWidgetValue4x4" />
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
+
             <LinearLayout
-        android:baselineAligned="false"
+                style="@style/TrackWidgetHorizontalSeparator"
-        style="@style/TrackWidgetHorizontalSeparator" >
+                android:baselineAligned="false">
+
                 <LinearLayout
-          android:layout_weight="1"
+                    style="@style/TrackWidgetHorizontalSpacer"
-          style="@style/TrackWidgetHorizontalSpacer" />
+                    android:layout_weight="1" />
+
                 <LinearLayout
-          android:layout_weight="38"
+                    style="@style/TrackWidgetHorizontalLine"
-          style="@style/TrackWidgetHorizontalLine" />
+                    android:layout_weight="38" />
+
                 <LinearLayout
-          android:layout_weight="1"
+                    style="@style/TrackWidgetHorizontalSpacer"
-          style="@style/TrackWidgetHorizontalSpacer" />
+                    android:layout_weight="1" />
             </LinearLayout>
-      <LinearLayout style="@style/TrackWidgetStatsSection" >
+
+            <LinearLayout style="@style/TrackWidgetStatsSection">
                 <!-- item2 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
+                <LinearLayout style="@style/TrackWidgetItemContainer4x3">
+
                     <TextView
                         android:id="@+id/track_widget_item2_label"
                         style="@style/TrackWidgetLabel4x4" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
                         <TextView
                             android:id="@+id/track_widget_item2_value"
                             style="@style/TrackWidgetValue4x3" />
+
                         <TextView
                             android:id="@+id/track_widget_item2_unit"
                             style="@style/TrackWidgetUnit4x3" />
+
                         <Chronometer
                             android:id="@+id/track_widget_item2_chronometer"
                             style="@style/TrackWidgetValue4x3" />
@@ -109,27 +135,34 @@ limitations under the License.
                 </LinearLayout>
                 <!-- vertical separator -->
                 <LinearLayout
-          android:baselineAligned="false"
+                    style="@style/TrackWidgetVerticalSeparator"
-          style="@style/TrackWidgetVerticalSeparator" >
+                    android:baselineAligned="false">
+
                     <LinearLayout
-            android:layout_weight="1"
+                        style="@style/TrackWidgetVerticalLine"
-            style="@style/TrackWidgetVerticalLine" />
+                        android:layout_weight="1" />
+
                     <LinearLayout
-            android:layout_weight="2"
+                        style="@style/TrackWidgetVerticalSpacer"
-            style="@style/TrackWidgetVerticalSpacer" />
+                        android:layout_weight="2" />
                 </LinearLayout>
                 <!-- item4 -->
-        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
+                <LinearLayout style="@style/TrackWidgetItemContainer4x3">
+
                     <TextView
                         android:id="@+id/track_widget_item4_label"
                         style="@style/TrackWidgetLabel4x4" />
-          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+
+                    <LinearLayout style="@style/TrackWidgetValueContainer4x3">
+
                         <TextView
                             android:id="@+id/track_widget_item4_value"
                             style="@style/TrackWidgetValue4x3" />
+
                         <TextView
                             android:id="@+id/track_widget_item4_unit"
                             style="@style/TrackWidgetUnit4x3" />
+
                         <Chronometer
                             android:id="@+id/track_widget_item4_chronometer"
                             style="@style/TrackWidgetValue4x3" />
@@ -137,29 +170,36 @@ limitations under the License.
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    <LinearLayout style="@style/TrackWidgetButtonContainer" >
+
+        <LinearLayout style="@style/TrackWidgetButtonContainer">
+
             <LinearLayout
-        android:layout_weight="1"
+                style="@style/TrackWidgetVerticalSpacer"
-        style="@style/TrackWidgetVerticalSpacer" />
+                android:layout_weight="1" />
+
             <ImageButton
-        android:contentDescription="@string/image_record"
                 android:id="@+id/track_widget_record_button"
-        android:src="@drawable/button_record"      
+                style="@style/TrackWidgetButton"
-        style="@style/TrackWidgetButton" />
+                android:contentDescription="@string/image_record"
+                android:src="@drawable/button_record" />
+
             <TextView
                 android:id="@+id/track_widget_record_status"
                 style="@style/TrackWidgetRecordStatus" />
+
             <ImageButton
-        android:contentDescription="@string/image_stop"
                 android:id="@+id/track_widget_stop_button"
-        android:src="@drawable/ic_button_stop_disabled"
+                style="@style/TrackWidgetButton"
-        style="@style/TrackWidgetButton" />
+                android:contentDescription="@string/image_stop"
+                android:src="@drawable/ic_button_stop_disabled" />
+
             <LinearLayout
-        android:layout_weight="1"
+                style="@style/TrackWidgetVerticalSpacer"
-        style="@style/TrackWidgetVerticalSpacer" />
+                android:layout_weight="1" />
         </LinearLayout>
     </LinearLayout>
+
     <ImageView
-    android:contentDescription="@string/image_my_tracks_logo"
+        style="@style/TrackWidgetLogo4x4"
-    style="@style/TrackWidgetLogo4x4" />
+        android:contentDescription="@string/image_my_tracks_logo" />
 </RelativeLayout>

src/main/res/layout/track_widget_config.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,31 +14,40 @@ 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_width="match_parent"
     android:layout_height="match_parent"
-  android:layout_width="match_parent"
+    android:orientation="vertical">
-  android:orientation="vertical" >
+
-  <ScrollView style="@style/ScrollView.WithBottomButtons" >
+    <ScrollView style="@style/ScrollView.WithBottomButtons">
+
         <LinearLayout
-      android:layout_height="wrap_content"
             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
-      android:padding="8dp" >
+            android:padding="8dp">
+
             <Spinner
                 android:id="@+id/track_widget_config_item1"
                 style="@style/TrackWidgetConfigSpinner" />
+
             <Spinner
                 android:id="@+id/track_widget_config_item2"
                 style="@style/TrackWidgetConfigSpinner" />
+
             <Spinner
                 android:id="@+id/track_widget_config_item3"
                 style="@style/TrackWidgetConfigSpinner" />
+
             <Spinner
                 android:id="@+id/track_widget_config_item4"
                 style="@style/TrackWidgetConfigSpinner" />
         </LinearLayout>
     </ScrollView>
+
     <View style="@style/BottomButtonDivider" />
-  <LinearLayout style="@style/BottomButtonBar" >
+
+    <LinearLayout style="@style/BottomButtonBar">
+
         <include layout="@layout/track_widget_config_buttons" />
     </LinearLayout>
 </LinearLayout>

src/main/res/layout/track_widget_config_buttons.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,16 +13,17 @@ 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.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- In v14, postive button on the right. -->
     <Button
         android:id="@+id/track_widget_config_cancel"
+        style="@style/BottomButton"
         android:layout_gravity="left"
-    android:text="@string/generic_cancel"
+        android:text="@string/generic_cancel" />
-    style="@style/BottomButton" />
+
     <Button
         android:id="@+id/track_widget_config_add"
+        style="@style/BottomButton"
         android:layout_gravity="right"
-    android:text="@string/generic_add"
+        android:text="@string/generic_add" />
-    style="@style/BottomButton" />
 </merge>

src/main/res/menu/list_context_menu.xml

@@ -16,27 +16,27 @@ limitations under the License.
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/list_context_menu_share"
-        android:title="@string/menu_share"
         android:actionProviderClass="android.widget.ShareActionProvider"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_share" />
     <item
         android:id="@+id/list_context_menu_show_on_map"
         android:icon="@drawable/ic_menu_show_on_map"
-        android:title="@string/menu_show_on_map"
+        android:showAsAction="ifRoom"
-        android:showAsAction="ifRoom" />
+        android:title="@string/menu_show_on_map" />
     <item
         android:id="@+id/list_context_menu_edit"
         android:icon="@drawable/ic_menu_edit"
-        android:title="@string/menu_edit"
+        android:showAsAction="ifRoom"
-        android:showAsAction="ifRoom" />
+        android:title="@string/menu_edit" />
     <item
         android:id="@+id/list_context_menu_delete"
         android:icon="@drawable/ic_menu_delete"
-        android:title="@string/menu_delete"
+        android:showAsAction="ifRoom"
-        android:showAsAction="ifRoom" />
+        android:title="@string/menu_delete" />
     <item
         android:id="@+id/list_context_menu_select_all"
         android:icon="@drawable/ic_menu_select_all"
-        android:title="@string/menu_select_all"
+        android:showAsAction="ifRoom"
-        android:showAsAction="ifRoom" />
+        android:title="@string/menu_select_all" />
 </menu>

src/main/res/menu/marker_detail.xml

@@ -17,16 +17,16 @@ limitations under the License.
     <item
         android:id="@+id/marker_detail_show_on_map"
         android:icon="@drawable/ic_menu_show_on_map"
-        android:title="@string/menu_show_on_map"
+        android:showAsAction="ifRoom"
-        android:showAsAction="ifRoom" />
+        android:title="@string/menu_show_on_map" />
     <item
         android:id="@+id/marker_detail_edit"
         android:icon="@drawable/ic_menu_edit"
-        android:title="@string/menu_edit"
+        android:showAsAction="ifRoom"
-        android:showAsAction="ifRoom" />
+        android:title="@string/menu_edit" />
     <item
         android:id="@+id/marker_detail_delete"
         android:icon="@drawable/ic_menu_delete"
-        android:title="@string/menu_delete"
+        android:showAsAction="ifRoom"
-        android:showAsAction="ifRoom" />
+        android:title="@string/menu_delete" />
 </menu>

src/main/res/menu/marker_list.xml

@@ -17,11 +17,11 @@ limitations under the License.
     <item
         android:id="@+id/marker_list_insert_marker"
         android:icon="@drawable/ic_menu_insert_marker"
-        android:title="@string/menu_insert_marker"
+        android:showAsAction="ifRoom"
-        android:showAsAction="ifRoom" />
+        android:title="@string/menu_insert_marker" />
     <item
         android:id="@+id/marker_list_search"
-        android:title="@string/menu_search"
         android:actionViewClass="android.widget.SearchView"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_search" />
 </menu>

src/main/res/menu/search_list.xml

@@ -16,7 +16,7 @@ limitations under the License.
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/search_list_search"
-        android:title="@string/menu_search"
         android:actionViewClass="android.widget.SearchView"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_search" />
 </menu>

src/main/res/menu/track_detail.xml

@@ -18,26 +18,26 @@ limitations under the License.
         android:id="@+id/track_detail_insert_marker"
         android:icon="@drawable/ic_menu_insert_marker"
         android:orderInCategory="1"
-        android:title="@string/menu_insert_marker"
+        android:showAsAction="ifRoom"
-        android:showAsAction="ifRoom" />
+        android:title="@string/menu_insert_marker" />
     <item
         android:id="@+id/track_detail_insert_photo"
         android:icon="@drawable/ic_menu_insert_photo"
         android:orderInCategory="2"
-        android:title="@string/menu_insert_photo"
+        android:showAsAction="ifRoom"
-        android:showAsAction="ifRoom" />
+        android:title="@string/menu_insert_photo" />
     <item
         android:id="@+id/track_detail_share"
-        android:orderInCategory="4"
-        android:title="@string/menu_share"
         android:actionProviderClass="android.widget.ShareActionProvider"
-        android:showAsAction="ifRoom" />
+        android:orderInCategory="4"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_share" />
     <item
         android:id="@+id/track_detail_markers"
         android:icon="@drawable/ic_menu_insert_marker"
         android:orderInCategory="5"
-        android:title="@string/menu_markers"
+        android:showAsAction="ifRoom"
-        android:showAsAction="ifRoom" />
+        android:title="@string/menu_markers" />
     <item
         android:id="@+id/track_detail_edit"
         android:icon="@drawable/ic_menu_edit"

src/main/res/menu/track_list.xml

@@ -16,20 +16,20 @@ limitations under the License.
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/track_list_search"
-        android:title="@string/menu_search"
         android:actionViewClass="android.widget.SearchView"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_search" />
     <item
         android:id="@+id/track_list_start_gps"
         android:icon="@drawable/ic_menu_start_gps"
-        android:title="@string/menu_start_gps"
+        android:showAsAction="ifRoom"
-        android:showAsAction="ifRoom" />
+        android:title="@string/menu_start_gps" />
     <item
         android:id="@+id/track_list_markers"
         android:icon="@drawable/ic_menu_insert_marker"
         android:orderInCategory="5"
-        android:title="@string/menu_markers"
+        android:showAsAction="ifRoom"
-        android:showAsAction="ifRoom" />
+        android:title="@string/menu_markers" />
     <item
         android:id="@+id/track_list_aggregated_statistics"
         android:icon="@drawable/ic_menu_aggregated_statistics"

src/main/res/values/arrays_do_not_translate.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");

src/main/res/values/colors.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");

src/main/res/values/dimens.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");

src/main/res/values/do_not_translate.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");

src/main/res/values/keys.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");

src/main/res/values/plurals.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2011 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");

src/main/res/values/styles.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
+
     <style name="ActionBarStyleCustom" parent="@android:style/Widget.Holo.ActionBar">
         <!-- Same image as the source except using a grey line instead of a blue line -->
         <item name="android:background">@drawable/ab_transparent_dark_holo</item>
     </style>
+
     <style name="BottomButton" parent="@android:style/Widget.Holo.Button.Borderless">
         <!-- Same as BottomButton in values/styles.xml except inheriting from Widget.Holo.Button.Borderles. -->
         <item name="android:layout_height">wrap_content</item>
@@ -26,6 +27,7 @@ limitations under the License.
         <item name="android:layout_width">0dp</item>
         <item name="android:maxLines">2</item>
     </style>
+
     <style name="BottomButtonBar" parent="@android:style/Holo.ButtonBar">
         <!--
         Same as BottomButtonBar in values/styles.xml except inheriting from Holo.ButtonBar and
@@ -35,6 +37,7 @@ limitations under the License.
         <item name="android:layout_width">match_parent</item>
         <item name="android:measureWithLargestChild">true</item>
     </style>
+
     <style name="BottomButtonDivider">
         <item name="android:background">?android:attr/dividerVertical</item>
         <item name="android:layout_height">1dp</item>
@@ -109,9 +112,11 @@ limitations under the License.
         <item name="android:padding">8dp</item>
         <item name="android:textColor">@color/list_empty_text</item>
     </style>
+
     <style name="ListItem">
         <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
     </style>
+
     <style name="ListItemDate" parent="@style/TextSmall">
         <item name="android:gravity">right</item>
         <item name="android:layout_gravity">bottom</item>
@@ -155,6 +160,7 @@ limitations under the License.
         <item name="android:paddingBottom">6dp</item>
         <item name="android:paddingTop">6dp</item>
     </style>
+
     <style name="StatsLargeLabel" parent="@style/TextSmall">
         <!-- same as StatsLargeLabel in values/styles.xml except adding textAllCaps -->
         <item name="android:gravity">center</item>
@@ -164,6 +170,7 @@ limitations under the License.
         <item name="android:textColor">@color/stats_large_label</item>
         <item name="android:textStyle">bold</item>
     </style>
+
     <style name="StatsLargeValue">
         <item name="android:layout_gravity">bottom</item>
         <item name="android:layout_height">wrap_content</item>
@@ -193,6 +200,7 @@ limitations under the License.
     <style name="StatsSmallItemContainer" parent="@style/StatsLargeItemContainer">
         <item name="android:paddingTop">12dp</item>
     </style>
+
     <style name="StatsSmallLabel" parent="@style/TextSmall">
         <!-- same as StatsSmallLabel in values/styles.xml except adding textAllCaps -->
         <item name="android:gravity">center</item>
@@ -223,20 +231,24 @@ limitations under the License.
         <item name="android:paddingLeft">4dp</item>
         <item name="android:singleLine">true</item>
     </style>
+
     <style name="Text">
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:textColor">@android:color/white</item>
     </style>
+
     <style name="TextChooseActivity">
         <!-- Same as TextChooseActivity in values/styles.xml except removing textSize and using textAppearance -->
         <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>
     </style>
+
     <style name="TextLarge" parent="@android:style/TextAppearance.Holo.Large">
         <!-- same as TextLarge in values/styles.xml except inheriting from a parent instead of specifying textSize -->
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
     </style>
+
     <style name="TextMedium" parent="@android:style/TextAppearance.Holo.Medium">
         <!-- same as TextMedium in values/styles.xml except inheriting from a parent instead of specifying textSize -->
         <item name="android:layout_height">wrap_content</item>
@@ -251,6 +263,7 @@ limitations under the License.
     <style name="TextMicro" parent="@style/Text">
         <item name="android:textSize">12sp</item>
     </style>
+
     <style name="TextSmall" parent="@android:style/TextAppearance.Holo.Small">
         <!-- same as TextSmall in values/styles.xml except inheriting from a parent instead of specifying textSize -->
         <item name="android:layout_height">wrap_content</item>
@@ -335,6 +348,7 @@ limitations under the License.
         <item name="android:paddingBottom">12dp</item>
         <item name="android:paddingTop">12dp</item>
     </style>
+
     <style name="TrackWidgetLabel">
         <!-- same as TrackWidgetLabel in values/styles.xml except adding textAllCaps -->
         <item name="android:layout_gravity">center_horizontal</item>
@@ -346,6 +360,7 @@ limitations under the License.
         <item name="android:textStyle">bold</item>
         <item name="android:textAllCaps">true</item>
     </style>
+
     <style name="TrackWidgetLabel4x4" parent="@style/TrackWidgetLabel">
         <item name="android:textSize">14dp</item>
     </style>

src/main/res/values/styles_custom.xml

@@ -1,14 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!-- Generated with http://android-holo-colors.com -->
-<!-- Generated with http://android-holo-colors.com -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
+
     <style name="AutoCompleteTextViewCustom" parent="android:Widget.Holo.AutoCompleteTextView">
         <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
         <item name="android:background">@drawable/edit_text_holo_dark</item>
     </style>
+
     <style name="ProgressBarCustom" parent="android:Widget.Holo.ProgressBar.Horizontal">
         <item name="android:progressDrawable">@drawable/progress_horizontal_holo_dark</item>
-    <item name="android:indeterminateDrawable">@drawable/progress_indeterminate_horizontal_holo_dark</item>
+        <item name="android:indeterminateDrawable">
+            @drawable/progress_indeterminate_horizontal_holo_dark
+        </item>
     </style>
+
     <style name="SpinnerCustom" parent="android:Widget.Holo.Spinner">
         <item name="android:background">@drawable/spinner_background_holo_dark</item>
         <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>

src/main/res/values/themes_custom.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2013 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
+
     <style name="ThemeCustom" parent="android:Theme.Holo">
         <!-- Auto generated -->
-    <item name="android:activatedBackgroundIndicator">@drawable/activated_background_holo_dark</item>
+        <item name="android:activatedBackgroundIndicator">@drawable/activated_background_holo_dark
+        </item>
         <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewCustom</item>
         <item name="android:dropDownSpinnerStyle">@style/SpinnerCustom</item>
         <item name="android:editTextBackground">@drawable/edit_text_holo_dark</item>
@@ -30,9 +31,11 @@ limitations under the License.
         <item name="android:actionModeBackground">@drawable/custom_action_mode_background</item>
         <item name="android:alertDialogTheme">@style/CustomAlertDialogTheme</item>
     </style>
+
     <style name="CustomAlertDialogTheme" parent="@android:style/Theme.Holo.Dialog">
         <!-- From auto generated -->
-    <item name="android:activatedBackgroundIndicator">@drawable/activated_background_holo_dark</item>
+        <item name="android:activatedBackgroundIndicator">@drawable/activated_background_holo_dark
+        </item>
         <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewCustom</item>
         <item name="android:dropDownSpinnerStyle">@style/SpinnerCustom</item>
         <item name="android:editTextBackground">@drawable/edit_text_holo_dark</item>

src/main/res/values/third_party.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");

src/main/res/xml/settings.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2010 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:title="@string/menu_settings" >
+    android:title="@string/menu_settings">
     <Preference
         android:key="@string/settings_chart_key"
         android:persistent="false"

src/main/res/xml/settings_advanced.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:title="@string/settings_advanced" >
+    android:title="@string/settings_advanced">
     <ListPreference
         android:defaultValue="1024"
         android:key="@string/photo_size_key"

src/main/res/xml/settings_chart.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:title="@string/track_detail_chart_tab" >
+    android:title="@string/track_detail_chart_tab">
     <ListPreference
         android:defaultValue="@string/chart_x_axis_distance"
         android:key="@string/chart_x_axis_key"
         android:title="@string/settings_chart_x_axis" />
-  <PreferenceCategory android:title="@string/settings_show" >
+    <PreferenceCategory android:title="@string/settings_show">
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="@string/chart_show_elevation_key"
@@ -32,8 +31,8 @@ limitations under the License.
             android:defaultValue="true"
             android:key="@string/chart_show_heart_rate_key"
             android:title="@string/sensor_state_heart_rate" />
-<!--
+        <!--
-TODO: Sensors are not implemented.
+        TODO: Sensors are not implemented.
             <CheckBoxPreference
               android:defaultValue="true"
               android:key="@string/chart_show_cadence_key"
@@ -42,6 +41,6 @@ TODO: Sensors are not implemented.
               android:defaultValue="true"
               android:key="@string/chart_show_power_key"
               android:title="@string/sensor_state_power" />
--->
+        -->
     </PreferenceCategory>
 </PreferenceScreen>

src/main/res/xml/settings_recording.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:title="@string/settings_recording" >
+    android:title="@string/settings_recording">
     <ListPreference
         android:defaultValue="0"
         android:key="@string/voice_frequency_key"

src/main/res/xml/settings_sensors.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,10 +15,10 @@ limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:key="@string/settings_sensor_root_key"
-  android:title="@string/settings_sensor" >
+    android:title="@string/settings_sensor">
     <PreferenceCategory
         android:key="@string/settings_sensor_bluetooth_key"
-    android:title="@string/settings_sensor_bluetooth" >
+        android:title="@string/settings_sensor_bluetooth">
         <Preference
             android:key="@string/settings_sensor_bluetooth_pairing_key"
             android:persistent="false"

src/main/res/xml/settings_statistics.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2012 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:title="@string/track_detail_stats_tab" >
+    android:title="@string/track_detail_stats_tab">
     <ListPreference
         android:defaultValue="@string/stats_units_metric"
         android:key="@string/stats_units_key"
@@ -24,7 +23,7 @@ limitations under the License.
         android:defaultValue="@string/stats_rate_speed"
         android:key="@string/stats_rate_key"
         android:title="@string/settings_stats_rate_title" />
-  <PreferenceCategory android:title="@string/settings_show" >
+    <PreferenceCategory android:title="@string/settings_show">
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="@string/stats_show_grade_elevation_key"

src/main/res/xml/track_widget_info.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
 Copyright 2011 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,10 +17,10 @@ limitations under the License.
     android:configure="com.google.android.apps.mytracks.widgets.TrackWidgetConfigActivity"
     android:initialKeyguardLayout="@layout/track_widget_4x1"
     android:initialLayout="@layout/track_widget_4x2"
-  android:minHeight="110dp"
-  android:minResizeHeight="40dp"
-  android:minResizeWidth="250dp"
     android:minWidth="250dp"
+    android:minHeight="110dp"
+    android:minResizeWidth="250dp"
+    android:minResizeHeight="40dp"
     android:resizeMode="vertical"
     android:updatePeriodMillis="0"
     android:widgetCategory="keyguard|home_screen" />