diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 0ed7f68a1..825601226 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -15,301 +15,342 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.android.maps.mytracks"
-          android:installLocation="auto"
-          android:versionCode="38"
-          android:versionName="1.1.15">
+  android:installLocation="auto"
+  android:versionCode="38"
+  android:versionName="1.1.15"
+  package="com.google.android.maps.mytracks" >
 
-  <!-- Permissions to initialize service -->
-  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
-  <!-- Permissions for recording tracks and showing maps -->
-  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-permission android:name="android.permission.BLUETOOTH" />
-  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
-  <uses-permission android:name="com.dsi.ant.permission.ANT" />
-  <uses-permission android:name="com.dsi.ant.permission.ANT_ADMIN" />
-
-  <!-- Permissions for uploading tracks -->
-  <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-  <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-  <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
-  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.fusiontables" />
-  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.local" />
-  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.wise" />
-  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.writely" />
-  <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
-
-  <!-- Permissions for misc services -->
-  <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-  <!-- Exported permissions (for other apps to use our features) -->
-  <!-- Permission to get track start/end broadcasts -->
-  <permission android:name="com.google.android.apps.mytracks.TRACK_NOTIFICATIONS"
-              android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/permission_notification_label"
-              android:description="@string/permission_notification_description"
-              android:protectionLevel="dangerous" />
-  <!-- Permission to read raw track data (points, etc.) -->
-  <permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA"
-              android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/permission_read_label"
-              android:description="@string/permission_read_description"
-              android:protectionLevel="dangerous" />
-  <!-- Permission to write track data, either raw or by making service calls -->
-  <permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA"
-              android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/permission_write_label"
-              android:description="@string/permission_write_description"
-              android:protectionLevel="dangerous" />
-
-  <!-- Permission to get MyTracks broadcasts. For internal MyTracks communication. -->
-  <permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
-              android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/permission_notification_label"
-              android:description="@string/permission_notification_label"
-              android:protectionLevel="signature" />
-
-  <!-- We read and write raw track data, obviously. -->
-  <uses-permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA" />
-  <uses-permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
-  <uses-permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS" />
-
-  <!-- Features required -->
-  <uses-feature android:name="android.hardware.location" android:required="true"/>
-  <uses-feature android:name="android.hardware.location.gps" android:required="true"/>
-
-  <!-- Features optional -->
-  <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
-  <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
-  <uses-feature android:name="android.hardware.location.network" android:required="false"/>
-  <uses-feature android:name="android.hardware.sensor.compass" android:required="false"/>
-  <uses-feature android:name="android.hardware.telephony" android:required="false"/>
-  <uses-feature android:name="android.hardware.telephony.gsm" android:required="false"/>
-  <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-  <uses-feature android:name="android.hardware.touchscreen.multitouch" android:required="false"/>
-
-  <uses-sdk android:minSdkVersion="7"/>
-  <supports-screens
-          android:xlargeScreens="true"
-          android:largeScreens="true"
-          android:normalScreens="true"
-          android:smallScreens="true"
-          android:anyDensity="true" />
-
-  <application android:icon="@drawable/arrow_icon"
-               android:label="@string/my_tracks_app_name"
-               android:name="com.google.android.apps.mytracks.MyTracksApplication"
-               android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent"
-               android:theme="@style/ThemeSelector" >
-    <uses-library android:name="com.google.android.maps" />
-
-    <meta-data android:name="com.google.android.backup.api_key"
-               android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
-
-    <!-- Main track data provider -->
-    <provider android:name="com.google.android.apps.mytracks.content.MyTracksProvider"
-              android:authorities="com.google.android.maps.mytracks"
-              android:exported="true"
-              android:readPermission="com.google.android.apps.mytracks.READ_TRACK_DATA"
-              android:writePermission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
-
-    <!-- Provider for search suggestions -->
-    <provider android:name="com.google.android.apps.mytracks.content.SearchEngineProvider"
-              android:authorities="com.google.android.maps.mytracks.search"
-              android:exported="false" />
-
-    <!-- Main activity -->
-    <activity android:name="com.google.android.apps.mytracks.MyTracks"
-              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.waypoint" />
-      </intent-filter>
-
-      <!-- Enable searches via SearchActivity. -->
-      <meta-data android:name="android.app.default_searchable"
-                 android:value="com.google.android.apps.mytracks.SearchActivity" />
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.MapActivity"
-              android:exported="false">
-      <intent-filter>
+  <application
+    android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent"
+    android:icon="@drawable/arrow_icon"
+    android:label="@string/my_tracks_app_name"
+    android:name="com.google.android.apps.mytracks.MyTracksApplication"
+    android:theme="@style/ThemeSelector" >
+    <activity
+      android:label="@string/menu_aggregated_statistics"
+      android:name="com.google.android.apps.mytracks.AggregatedStatsActivity" />
+    <activity
+      android:exported="false"
+      android:name="com.google.android.apps.mytracks.ChartActivity" >
+      <intent-filter >
         <category android:name="android.intent.category.TAB" />
       </intent-filter>
 
-      <!-- Enable searches via SearchActivity. -->
-      <meta-data android:name="android.app.default_searchable"
-                 android:value="com.google.android.apps.mytracks.SearchActivity" />
+      <meta-data
+        android:name="android.app.default_searchable"
+        android:value="com.google.android.apps.mytracks.SearchActivity" />
     </activity>
-
-
-    <!-- TODO: Merge TrackList, WaypointsLIst and SearchActivity, then implement VIEW and PICK for track and waypoint cursor dir -->
-    <activity android:name="com.google.android.apps.mytracks.TrackList">
-      <!-- Enable searches via SearchActivity. -->
-      <meta-data android:name="android.app.default_searchable"
-                 android:value="com.google.android.apps.mytracks.SearchActivity" />
-    </activity>
-
-    <!-- TODO: VIEW and PICK for waypoint cursor dir -->
-    <activity android:name="com.google.android.apps.mytracks.WaypointsList">
-      <!-- Enable searches via SearchActivity. -->
-      <meta-data android:name="android.app.default_searchable"
-                 android:value="com.google.android.apps.mytracks.SearchActivity" />
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.TrackDetail"
-              android:label="@string/track_detail_title">
-      <intent-filter>
-        <action android:name="android.intent.action.EDIT" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
-      </intent-filter>
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.DeleteTrack"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar"
-              android:noHistory="true">
-      <intent-filter>
+    <activity
+      android:name="com.google.android.apps.mytracks.DeleteTrack"
+      android:noHistory="true"
+      android:theme="@android:style/Theme.Translucent.NoTitleBar" >
+      <intent-filter >
         <action android:name="android.intent.action.DELETE" />
+
         <category android:name="android.intent.category.DEFAULT" />
+
         <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
       </intent-filter>
     </activity>
+    <activity
+      android:exported="false"
+      android:name="com.google.android.apps.mytracks.MapActivity" >
+      <intent-filter >
+        <category android:name="android.intent.category.TAB" />
+      </intent-filter>
+
+      <meta-data
+        android:name="android.app.default_searchable"
+        android:value="com.google.android.apps.mytracks.SearchActivity" />
+    </activity>
+    <activity
+      android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale"
+      android:name="com.google.android.apps.mytracks.MyTracks" >
+      <intent-filter >
+        <action android:name="android.intent.action.MAIN" />
+
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+      <intent-filter >
+        <action android:name="android.intent.action.VIEW" />
 
-    <activity android:name="com.google.android.apps.mytracks.WaypointDetails"
-              android:label="@string/marker_detail_title">
-      <intent-filter>
-        <action android:name="android.intent.action.EDIT" />
-        <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
+        <category android:name="android.intent.category.DEFAULT" />
+
+        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
         <data android:mimeType="vnd.android.cursor.item/vnd.google.waypoint" />
       </intent-filter>
-    </activity>
 
-    <activity android:name="com.google.android.apps.mytracks.SettingsActivity"
-              android:label="@string/settings_title" >
-      <intent-filter>
+      <meta-data
+        android:name="android.app.default_searchable"
+        android:value="com.google.android.apps.mytracks.SearchActivity" />
+    </activity>
+    <activity
+      android:launchMode="singleTop"
+      android:name="com.google.android.apps.mytracks.SearchActivity" >
+      <intent-filter >
+        <action android:name="android.intent.action.SEARCH" />
+      </intent-filter>
+
+      <meta-data
+        android:name="android.app.searchable"
+        android:resource="@xml/search" />
+    </activity>
+    <activity
+      android:label="@string/menu_sensor_state"
+      android:name="com.google.android.apps.mytracks.SensorStateActivity" />
+    <activity
+      android:label="@string/settings_title"
+      android:name="com.google.android.apps.mytracks.SettingsActivity" >
+      <intent-filter >
         <category android:name="android.intent.category.PREFERENCE" />
       </intent-filter>
     </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.AggregatedStatsActivity"
-              android:label="@string/menu_aggregated_statistics" />
-
-    <activity android:name="com.google.android.apps.mytracks.StatsActivity"
-              android:exported="false">
-      <intent-filter>
+    <activity
+      android:exported="false"
+      android:name="com.google.android.apps.mytracks.StatsActivity" >
+      <intent-filter >
         <category android:name="android.intent.category.TAB" />
       </intent-filter>
 
-      <!-- Enable searches via SearchActivity. -->
-      <meta-data android:name="android.app.default_searchable"
-                 android:value="com.google.android.apps.mytracks.SearchActivity" />
+      <meta-data
+        android:name="android.app.default_searchable"
+        android:value="com.google.android.apps.mytracks.SearchActivity" />
     </activity>
+    <activity
+      android:label="@string/track_detail_title"
+      android:name="com.google.android.apps.mytracks.TrackDetail" >
+      <intent-filter >
+        <action android:name="android.intent.action.EDIT" />
 
-    <activity android:name="com.google.android.apps.mytracks.SensorStateActivity"
-              android:label="@string/menu_sensor_state" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <category android:name="android.intent.category.DEFAULT" />
 
-    <activity android:name="com.google.android.apps.mytracks.ChartActivity"
-              android:exported="false">
-      <intent-filter>
-        <category android:name="android.intent.category.TAB" />
-      </intent-filter>
-
-      <!-- Enable searches via SearchActivity. -->
-      <meta-data android:name="android.app.default_searchable"
-                 android:value="com.google.android.apps.mytracks.SearchActivity" />
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.io.file.SaveActivity"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar"
-              android:noHistory="true">
-      <intent-filter>
-        <action android:name="android.intent.action.SAVE" />
         <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
       </intent-filter>
     </activity>
+    <activity android:name="com.google.android.apps.mytracks.TrackList" >
+      <meta-data
+        android:name="android.app.default_searchable"
+        android:value="com.google.android.apps.mytracks.SearchActivity" />
+    </activity>
+    <activity
+      android:label="@string/marker_detail_title"
+      android:name="com.google.android.apps.mytracks.WaypointDetails" >
+      <intent-filter >
+        <action android:name="android.intent.action.EDIT" />
 
-    <activity android:name="com.google.android.apps.mytracks.io.file.ImportActivity"
-              android:label="@string/my_tracks_importer"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar"
-              android:noHistory="true">
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <action android:name="android.intent.action.ATTACH_DATA" />
-        <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
-        <data android:scheme="file" />
-        <data android:mimeType="application/gpx+xml" />
+        <category android:name="android.intent.category.DEFAULT" />
+
+        <data android:mimeType="vnd.android.cursor.item/vnd.google.waypoint" />
+      </intent-filter>
+    </activity>
+    <activity android:name="com.google.android.apps.mytracks.WaypointsList" >
+      <meta-data
+        android:name="android.app.default_searchable"
+        android:value="com.google.android.apps.mytracks.SearchActivity" />
+    </activity>
+    <activity
+      android:exported="false"
+      android:label="@string/welcome_title"
+      android:name="com.google.android.apps.mytracks.WelcomeActivity" />
+    <activity android:name="com.google.android.apps.mytracks.io.docs.SendDocsActivity" />
+    <activity
+      android:label="@string/my_tracks_importer"
+      android:name="com.google.android.apps.mytracks.io.file.ImportActivity"
+      android:noHistory="true"
+      android:theme="@android:style/Theme.Translucent.NoTitleBar" >
+      <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" />
         <data android:mimeType="application/vnd.google-earth.gpx+xml" />
+        <data android:scheme="file" />
       </intent-filter>
     </activity>
+    <activity
+      android:name="com.google.android.apps.mytracks.io.file.SaveActivity"
+      android:noHistory="true"
+      android:theme="@android:style/Theme.Translucent.NoTitleBar" >
+      <intent-filter >
+        <action android:name="android.intent.action.SAVE" />
 
-    <activity android:name="com.google.android.apps.mytracks.WelcomeActivity"
-              android:label="@string/welcome_title"
-              android:exported="false" />
-
-    <activity android:name="com.google.android.apps.mytracks.SearchActivity"
-              android:launchMode="singleTop">
-      <intent-filter>
-        <action android:name="android.intent.action.SEARCH" />
+        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
       </intent-filter>
-      <meta-data android:name="android.app.searchable"
-                 android:resource="@xml/search"/>
     </activity>
+    <activity android:name="com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesActivity" />
+    <activity
+      android:label="@string/maps_list_title"
+      android:name="com.google.android.apps.mytracks.io.maps.ChooseMapActivity" />
+    <activity android:name="com.google.android.apps.mytracks.io.maps.SendMapsActivity" />
+    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.AccountChooserActivity" />
+    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity" />
+    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity" />
 
-    <activity android:name="com.google.android.apps.mytracks.io.docs.SendDocsActivity"/>
-    <activity android:name="com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesActivity"/>
-    <activity android:name="com.google.android.apps.mytracks.io.maps.ChooseMapActivity"
-                            android:label="@string/maps_list_title"/>
-    <activity android:name="com.google.android.apps.mytracks.io.maps.SendMapsActivity"/>
-    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.AccountChooserActivity"/>
-    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity"/>
-    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity"/>
+    <meta-data
+      android:name="com.google.android.backup.api_key"
+      android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
 
-    <service android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
-             android:label="@string/my_tracks_recording_service"
-             android:icon="@drawable/arrow_320"
-             android:enabled="true"
-             android:exported="true"
-             android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
+    <!-- Permission to receive My Tracks internal broadcasts -->
+    <permission
+      android:description="@string/permission_notification_label"
+      android:label="@string/permission_notification_label"
+      android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
+      android:permissionGroup="android.permission-group.LOCATION"
+      android:protectionLevel="signature" />
+    <!-- Permission to read track data -->
+    <permission
+      android:description="@string/permission_read_description"
+      android:label="@string/permission_read_label"
+      android:name="com.google.android.apps.mytracks.READ_TRACK_DATA"
+      android:permissionGroup="android.permission-group.LOCATION"
+      android:protectionLevel="dangerous" />
+    <!-- Permission to receive track start/end broadcasts -->
+    <permission
+      android:description="@string/permission_notification_description"
+      android:label="@string/permission_notification_label"
+      android:name="com.google.android.apps.mytracks.TRACK_NOTIFICATIONS"
+      android:permissionGroup="android.permission-group.LOCATION"
+      android:protectionLevel="dangerous" />
+    <!-- Permission to write track data, either directly or through service calls -->
+    <permission
+      android:description="@string/permission_write_description"
+      android:label="@string/permission_write_label"
+      android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA"
+      android:permissionGroup="android.permission-group.LOCATION"
+      android:protectionLevel="dangerous" />
 
-    <service android:name="com.google.android.apps.mytracks.services.ControlRecordingService"
-             android:exported="false" />
-    <service android:name="com.google.android.apps.mytracks.services.RemoveTempFilesService"/>
+    <!-- My Tracks data provider -->
+    <provider
+      android:authorities="com.google.android.maps.mytracks"
+      android:exported="true"
+      android:name="com.google.android.apps.mytracks.content.MyTracksProvider"
+      android:readPermission="com.google.android.apps.mytracks.READ_TRACK_DATA"
+      android:writePermission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
+    <!-- Search suggestion provider -->
+    <provider
+      android:authorities="com.google.android.maps.mytracks.search"
+      android:exported="false"
+      android:name="com.google.android.apps.mytracks.content.SearchEngineProvider" />
 
-    <receiver android:name="com.google.android.apps.mytracks.BootReceiver">
-      <intent-filter>
+    <service
+      android:exported="false"
+      android:name="com.google.android.apps.mytracks.services.ControlRecordingService" />
+    <service android:name="com.google.android.apps.mytracks.services.RemoveTempFilesService" />
+    <service
+      android:enabled="true"
+      android:exported="true"
+      android:icon="@drawable/arrow_320"
+      android:label="@string/my_tracks_recording_service"
+      android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
+      android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
+
+    <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">
-      <intent-filter>
+    <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_STARTED" />
         <action android:name="com.google.android.apps.mytracks.TRACK_STOPPED" />
       </intent-filter>
-      <meta-data android:name="android.appwidget.provider"
-                 android:resource="@xml/track_widget_info" />
+
+      <meta-data
+        android:name="android.appwidget.provider"
+        android:resource="@xml/track_widget_info" />
     </receiver>
+
+    <supports-screens
+      android:anyDensity="true"
+      android:largeScreens="true"
+      android:normalScreens="true"
+      android:smallScreens="true"
+      android:xlargeScreens="true" />
+
+    <!-- Required features -->
+    <uses-feature
+      android:name="android.hardware.location"
+      android:required="true" />
+    <uses-feature
+      android:name="android.hardware.location.gps"
+      android:required="true" />
+
+    <!-- Optional features -->
+    <uses-feature
+      android:name="android.hardware.bluetooth"
+      android:required="false" />
+    <uses-feature
+      android:name="android.hardware.faketouch"
+      android:required="false" />
+    <uses-feature
+      android:name="android.hardware.location.network"
+      android:required="false" />
+    <uses-feature
+      android:name="android.hardware.sensor.compass"
+      android:required="false" />
+    <uses-feature
+      android:name="android.hardware.telephony"
+      android:required="false" />
+    <uses-feature
+      android:name="android.hardware.telephony.gsm"
+      android:required="false" />
+    <uses-feature
+      android:name="android.hardware.touchscreen"
+      android:required="false" />
+    <uses-feature
+      android:name="android.hardware.touchscreen.multitouch"
+      android:required="false" />
+
+    <uses-library android:name="com.google.android.maps" />
+
+    <!-- Permission to initialize services -->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
+    <!-- Permissions to record locations -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <!-- Permissions to access sensors -->
+    <uses-permission android:name="com.dsi.ant.permission.ANT" />
+    <uses-permission android:name="com.dsi.ant.permission.ANT_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+    <!-- Permissions to upload tracks -->
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
+    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.fusiontables" />
+    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.local" />
+    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.wise" />
+    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.writely" />
+    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
+
+    <!-- Permission to read phone state so voice announcement will not interrupt ongoing calls -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
+    <!-- Permission to write to SD card -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <!-- Permissions to access My Tracks data -->
+    <uses-permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS" />
+    <uses-permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA" />
+    <uses-permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
+
+    <uses-sdk android:minSdkVersion="7" />
   </application>
-</manifest>
+
+</manifest>
\ No newline at end of file
diff --git a/MyTracks/res/menu/main.xml b/MyTracks/res/menu/main.xml
index ec90de872..bbef87da1 100644
--- a/MyTracks/res/menu/main.xml
+++ b/MyTracks/res/menu/main.xml
@@ -14,65 +14,79 @@ 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.
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:id="@+id/menu_record_track"
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+  <item
     android:icon="@drawable/ic_menu_recordtrack"
-    android:title="@string/menu_record_track"
-    android:showAsAction="always"/>
+    android:id="@+id/menu_record_track"
+    android:showAsAction="always"
+    android:title="@string/menu_record_track"/>
 
-  <item android:id="@+id/menu_stop_recording"
+  <item
     android:icon="@drawable/ic_menu_stoprecording"
-    android:title="@string/menu_stop_recording"
-    android:showAsAction="always"/>
+    android:id="@+id/menu_stop_recording"
+    android:showAsAction="always"
+    android:title="@string/menu_stop_recording"/>
 
-  <item android:id="@+id/menu_tracks"
+  <item
     android:icon="@drawable/ic_menu_tracklist"
-    android:title="@string/menu_tracks"
-    android:showAsAction="ifRoom"/>
+    android:id="@+id/menu_tracks"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_tracks"/>
 
-  <item android:id="@+id/menu_markers"
+  <item
     android:icon="@drawable/ic_menu_waypoints"
-    android:title="@string/menu_markers"
-    android:showAsAction="ifRoom"/>
+    android:id="@+id/menu_markers"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_markers"/>
 
-  <item android:id="@+id/menu_chart_settings"
+  <item
     android:icon="@drawable/chart_settings"
+    android:id="@+id/menu_chart_settings"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_chart_view_chart_settings"
-    android:showAsAction="ifRoom"
     android:visible="false"/>
 
-  <item android:id="@+id/menu_my_location"
+  <item
     android:icon="@android:drawable/ic_menu_mylocation"
+    android:id="@+id/menu_my_location"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_map_view_my_location"
-    android:showAsAction="ifRoom"
     android:visible="false"/>
 
-  <item android:id="@+id/menu_satellite_mode"
+  <item
     android:icon="@android:drawable/ic_menu_mapmode"
-    android:title="@string/menu_map_view_satellite_mode"
+    android:id="@+id/menu_satellite_mode"
     android:showAsAction="ifRoom"
+    android:title="@string/menu_map_view_satellite_mode"
     android:visible="false"/>
 
-  <item android:id="@+id/menu_search"
+  <item
     android:icon="@android:drawable/ic_menu_search"
+    android:id="@+id/menu_search"
     android:title="@string/menu_search"/>
 
-  <item android:id="@+id/menu_sensor_state"
+  <item
     android:icon="@drawable/ic_menu_sensorstatus"
+    android:id="@+id/menu_sensor_state"
     android:orderInCategory="1000"
     android:title="@string/menu_sensor_state"/>
 
-  <item android:id="@+id/menu_settings"
+  <item
     android:icon="@android:drawable/ic_menu_preferences"
+    android:id="@+id/menu_settings"
     android:orderInCategory="1001"
     android:title="@string/menu_settings"/>
 
-  <item android:id="@+id/menu_aggregated_statistics"
+  <item
+    android:id="@+id/menu_aggregated_statistics"
     android:orderInCategory="1002"
     android:title="@string/menu_aggregated_statistics"/>
 
-  <item android:id="@+id/menu_help"
+  <item
     android:icon="@android:drawable/ic_menu_info_details"
+    android:id="@+id/menu_help"
     android:orderInCategory="1003"
     android:title="@string/menu_help"/>
-</menu>
+
+</menu>
\ No newline at end of file
diff --git a/MyTracks/res/menu/search_only.xml b/MyTracks/res/menu/search_only.xml
index 5065f209f..ccf072255 100644
--- a/MyTracks/res/menu/search_only.xml
+++ b/MyTracks/res/menu/search_only.xml
@@ -15,9 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-  <item android:id="@+id/menu_search"
+
+  <item
     android:icon="@android:drawable/ic_menu_search"
-    android:title="@string/menu_search"
+    android:id="@+id/menu_search"
     android:onClick="onSearch"
-    android:showAsAction="always" />
+    android:showAsAction="always"
+    android:title="@string/menu_search"/>
+
 </menu>
\ No newline at end of file
diff --git a/MyTracksLib/AndroidManifest.xml b/MyTracksLib/AndroidManifest.xml
index ddbe1b69c..c56a8cc5c 100644
--- a/MyTracksLib/AndroidManifest.xml
+++ b/MyTracksLib/AndroidManifest.xml
@@ -15,16 +15,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.google.android.apps.mytracks.lib"
-      android:versionCode="1"
-      android:versionName="1.0">
+  android:versionCode="1"
+  android:versionName="1.0" >
+
   <!--
      THIS IS A LIBRARY PROJECT.
      See http://developer.android.com/guide/developing/eclipse-adt.html#libraryProject
      for details on what should go here vs in the application project.
   -->
-  <uses-sdk android:minSdkVersion="7" />
-  <application android:icon="@drawable/arrow_icon"
-               android:label="@string/lib_name">
+  <application
+    android:icon="@drawable/arrow_icon"
+    android:label="@string/lib_name" >
   </application>
+
+  <uses-sdk android:minSdkVersion="7" />
+
 </manifest>
\ No newline at end of file
diff --git a/MyTracksTest/AndroidManifest.xml b/MyTracksTest/AndroidManifest.xml
index 113e39ba2..b7cb4ee78 100644
--- a/MyTracksTest/AndroidManifest.xml
+++ b/MyTracksTest/AndroidManifest.xml
@@ -1,14 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2012 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.google.android.maps.mytracks.test"
-      android:versionCode="1"
-      android:versionName="1.0"
-      android:debuggable="true">
-    <uses-sdk android:minSdkVersion="7" />
-    <application android:icon="@android:drawable/sym_def_app_icon"
-                 android:label="My Tracks Tests">
-      <uses-library android:name="android.test.runner" />
-    </application>
-    <instrumentation android:targetPackage="com.google.android.maps.mytracks"
-                     android:name="android.test.InstrumentationTestRunner" />
+  android:debuggable="true"
+  android:versionCode="1"
+  android:versionName="1.0"
+  package="com.google.android.maps.mytracks.test" >
+
+  <application
+    android:icon="@android:drawable/sym_def_app_icon"
+    android:label="My Tracks Tests" >
+    <uses-library android:name="android.test.runner" />
+  </application>
+
+  <instrumentation
+    android:name="android.test.InstrumentationTestRunner"
+    android:targetPackage="com.google.android.maps.mytracks" />
+
+  <uses-sdk android:minSdkVersion="7" />
+
 </manifest>
\ No newline at end of file