From 08a17a58ef80e1a9d856708bdb9b49c0896a9de1 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Tue, 20 Mar 2012 10:23:19 -0700
Subject: [PATCH] merge heads

---
 MyTracks/AndroidManifest.xml                  | 465 ++++++++++--------
 MyTracks/res/layout/upload_result.xml         |   3 -
 MyTracks/res/menu/main.xml                    |  58 ++-
 MyTracks/res/menu/search_only.xml             |   9 +-
 MyTracks/res/values-v11/styles.xml            |  19 +
 MyTracks/res/values/do_not_translate.xml      |   2 +-
 MyTracks/res/values/styles.xml                |   2 +
 .../mytracks/AggregatedStatsActivity.java     |   7 +-
 .../android/apps/mytracks/ChartActivity.java  |  36 +-
 .../android/apps/mytracks/Constants.java      |  15 +-
 .../android/apps/mytracks/MapActivity.java    |  79 ++-
 .../android/apps/mytracks/MenuManager.java    |  88 +++-
 .../android/apps/mytracks/MyTracks.java       |  74 ++-
 .../android/apps/mytracks/StatsActivity.java  |   8 +-
 .../apps/mytracks/util/Api11Adapter.java      |  33 ++
 .../apps/mytracks/util/Api7Adapter.java       |  15 +-
 .../apps/mytracks/util/ApiAdapter.java        |  12 +
 .../apps/mytracks/util/ApiAdapterFactory.java |   5 +-
 MyTracksLib/AndroidManifest.xml               |  18 +-
 MyTracksTest/AndroidManifest.xml              |  45 +-
 .../apps/mytracks/ChartActivityTest.java      |  24 -
 21 files changed, 640 insertions(+), 377 deletions(-)
 create mode 100644 MyTracks/res/values-v11/styles.xml
 create mode 100644 MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java

diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index f62a9b101..5ff5ac77e 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -15,28 +15,29 @@ 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="39"
-          android:versionName="1.1.16">
+  android:installLocation="auto"
+  android:versionCode="39"
+  android:versionName="1.1.16"
+  package="com.google.android.maps.mytracks" >
 
-  <!-- Permissions to initialize service -->
+  <!-- Permission to initialize services -->
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
-  <!-- Permissions for recording tracks and showing maps -->
+  <!-- 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.INTERNET" />
   <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" />
 
-  <uses-permission android:name="com.dsi.ant.permission.ANT" />
-  <uses-permission android:name="com.dsi.ant.permission.ANT_ADMIN" />
-
-  <!-- Permissions for uploading tracks -->
+  <!-- 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" />
@@ -46,269 +47,315 @@ limitations under the License.
   <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 -->
+  <!-- Permission to read phone state so voice announcement will not interrupt ongoing calls -->
   <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 write to SD card -->
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
-  <!-- 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. -->
+  <!-- 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-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"/>
+  <!-- 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" />
 
-  <!-- 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"
+    android:targetSdkVersion="15" />
+
+  <!-- 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-sdk android:minSdkVersion="7"/>
   <supports-screens
-          android:xlargeScreens="true"
-          android:largeScreens="true"
-          android:normalScreens="true"
-          android:smallScreens="true"
-          android:anyDensity="true" />
+    android:anyDensity="true"
+    android:largeScreens="true"
+    android:normalScreens="true"
+    android:smallScreens="true"
+    android:xlargeScreens="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">
-    <uses-library android:name="com.google.android.maps" />
+  <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"
+    android:uiOptions="splitActionBarWhenNarrow" >
 
-    <meta-data android:name="com.google.android.backup.api_key"
-               android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
+    <!-- For data backup -->
+    <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" />
+    <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>
 
-    <!-- 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" />
+      <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.DeleteTrack"
+      android:noHistory="true"
+      android:theme="@android:style/Theme.Translucent.NoTitleBar" >
+      <intent-filter>
+        <action android:name="android.intent.action.DELETE" />
 
-    <!-- Main activity -->
-    <activity android:name="com.google.android.apps.mytracks.MyTracks"
-              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale">
+        <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" />
-        <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>
 
-      <!-- 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:name="com.google.android.apps.mytracks.MapActivity"
-              android:exported="false">
+    <activity
+      android:launchMode="singleTop"
+      android:name="com.google.android.apps.mytracks.SearchActivity" >
       <intent-filter>
-        <category android:name="android.intent.category.TAB" />
+        <action android:name="android.intent.action.SEARCH" />
       </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.searchable"
+        android:resource="@xml/search" />
     </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>
-        <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: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" />
-        <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" >
+    <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">
+    <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:name="com.google.android.apps.mytracks.SensorStateActivity"
-              android:label="@string/menu_sensor_state" />
-
-    <activity android:name="com.google.android.apps.mytracks.ChartActivity"
-              android:exported="false">
+    <activity
+      android:label="@string/track_detail_title"
+      android:name="com.google.android.apps.mytracks.TrackDetail" >
       <intent-filter>
-        <category android:name="android.intent.category.TAB" />
-      </intent-filter>
+        <action android:name="android.intent.action.EDIT" />
 
-      <!-- Enable searches via SearchActivity. -->
-      <meta-data android:name="android.app.default_searchable"
-                 android:value="com.google.android.apps.mytracks.SearchActivity" />
-    </activity>
+        <category android:name="android.intent.category.BROWSABLE" />
+        <category android:name="android.intent.category.DEFAULT" />
 
-    <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.io.file.ImportActivity"
-              android:label="@string/my_tracks_importer"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar"
-              android:noHistory="true">
+    <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.VIEW" />
-        <action android:name="android.intent.action.ATTACH_DATA" />
-        <category android:name="android.intent.category.DEFAULT" />
+        <action android:name="android.intent.action.EDIT" />
+
         <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.WelcomeActivity"
-              android:label="@string/welcome_title"
-              android:exported="false" />
-
-    <activity android:name="com.google.android.apps.mytracks.SearchActivity"
-              android:launchMode="singleTop">
+    <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.SEARCH" />
+        <action android:name="android.intent.action.SAVE" />
+
+        <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"/>
+    <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" />
 
-    <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" />
-
-    <service android:name="com.google.android.apps.mytracks.services.ControlRecordingService"
-             android:exported="false" />
-    <service android:name="com.google.android.apps.mytracks.services.RemoveTempFilesService"/>
-
-    <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_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>
+
+    <!-- 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" />
+
+    <uses-library android:name="com.google.android.maps" />
   </application>
-</manifest>
+
+</manifest>
\ No newline at end of file
diff --git a/MyTracks/res/layout/upload_result.xml b/MyTracks/res/layout/upload_result.xml
index 6148886d9..c2cb770c3 100644
--- a/MyTracks/res/layout/upload_result.xml
+++ b/MyTracks/res/layout/upload_result.xml
@@ -57,7 +57,6 @@ limitations under the License.
             android:text="@string/send_google_maps"
             style="?android:attr/textAppearanceMedium"/>
           <TextView
-            android:id="@+id/upload_result_list_item_url"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
             android:text="@string/send_google_maps_url"
@@ -87,7 +86,6 @@ limitations under the License.
             android:text="@string/send_google_fusion_tables"
             style="?android:attr/textAppearanceMedium"/>
           <TextView
-            android:id="@+id/upload_result_list_item_url"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
             android:text="@string/send_google_fusion_tables_url"
@@ -117,7 +115,6 @@ limitations under the License.
             android:text="@string/send_google_docs"
             style="?android:attr/textAppearanceMedium"/>
           <TextView
-            android:id="@+id/upload_result_list_item_url"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
             android:text="@string/send_google_docs_url"
diff --git a/MyTracks/res/menu/main.xml b/MyTracks/res/menu/main.xml
index 21c80178c..bbef87da1 100644
--- a/MyTracks/res/menu/main.xml
+++ b/MyTracks/res/menu/main.xml
@@ -14,43 +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: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: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: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:id="@+id/menu_markers"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_markers"/>
 
-  <item android:id="@+id/menu_search"
+  <item
+    android:icon="@drawable/chart_settings"
+    android:id="@+id/menu_chart_settings"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_chart_view_chart_settings"
+    android:visible="false"/>
+
+  <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:visible="false"/>
+
+  <item
+    android:icon="@android:drawable/ic_menu_mapmode"
+    android:id="@+id/menu_satellite_mode"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_map_view_satellite_mode"
+    android:visible="false"/>
+
+  <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/MyTracks/res/values-v11/styles.xml b/MyTracks/res/values-v11/styles.xml
new file mode 100644
index 000000000..24aa1d9b0
--- /dev/null
+++ b/MyTracks/res/values-v11/styles.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+<resources>
+  <style name="ThemeSelector" parent="android:Theme.Holo" />
+</resources>
diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml
index 674a589a6..d5bbe2710 100644
--- a/MyTracks/res/values/do_not_translate.xml
+++ b/MyTracks/res/values/do_not_translate.xml
@@ -35,7 +35,7 @@ limitations under the License.
     http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png
   </string>
   <string name="my_tracks_analytics_id">UA-7222692-2</string> 
-  <string name="my_tracks_privacy_url">m.google.com/privacy</string>
+  <string name="my_tracks_privacy_url">www.google.com/policies/privacy/</string>
   <string name="my_tracks_recording_service_name">My Tracks Recording Service</string>
   <string name="my_tracks_support_url">
     groups.google.com/a/googleproductforums.com/forum/#!categories/maps/mytracks
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index 868e3692c..af392d3fe 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
+  <style name="ThemeSelector" parent="android:Theme" />
+
   <!--  About page label -->
   <style name="AboutLabel">
     <item name="android:layout_height">wrap_content</item>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
index fa7d168a7..5620c807c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
@@ -3,6 +3,7 @@ package com.google.android.apps.mytracks;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.stats.TripStatistics;
+import com.google.android.apps.mytracks.util.ApiAdapterFactory;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
@@ -12,7 +13,6 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.view.Window;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
@@ -60,8 +60,9 @@ public class AggregatedStatsActivity extends Activity implements
 
     this.tracksProvider = MyTracksProviderUtils.Factory.get(this);
 
-    // We don't need a window title bar:
-    requestWindowFeature(Window.FEATURE_NO_TITLE);
+    // Show the action bar (or nothing at all).
+    ApiAdapterFactory.getApiAdapter().showActionBar(this);
+
     setContentView(R.layout.stats);
 
     ScrollView sv = ((ScrollView) findViewById(R.id.scrolly));
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
index e6c06f248..3f57ce45d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
@@ -28,6 +28,7 @@ import com.google.android.apps.mytracks.content.TrackDataListener;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.stats.DoubleBuffer;
 import com.google.android.apps.mytracks.stats.TripStatisticsBuilder;
+import com.google.android.apps.mytracks.util.ApiAdapterFactory;
 import com.google.android.apps.mytracks.util.LocationUtils;
 import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
@@ -41,12 +42,9 @@ import android.location.Location;
 import android.os.Bundle;
 import android.speech.tts.TextToSpeech;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
-import android.view.Window;
 import android.widget.LinearLayout;
 import android.widget.ZoomControls;
 
@@ -61,7 +59,8 @@ import java.util.EnumSet;
  */
 public class ChartActivity extends Activity implements TrackDataListener {
 
-  private static final int CHART_SETTINGS_DIALOG = 1;
+  public static final int CHART_SETTINGS_DIALOG = 1;
+
   private final DoubleBuffer elevationBuffer =
       new DoubleBuffer(Constants.ELEVATION_SMOOTHING_FACTOR);
   private final DoubleBuffer speedBuffer =
@@ -84,7 +83,6 @@ public class ChartActivity extends Activity implements TrackDataListener {
    * UI elements:
    */
   private ChartView chartView;
-  private MenuItem chartSettingsMenuItem;
   private LinearLayout busyPane;
   private ZoomControls zoomControls;
 
@@ -118,7 +116,9 @@ public class ChartActivity extends Activity implements TrackDataListener {
     // The volume we want to control is the Text-To-Speech volume
     setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
 
-    requestWindowFeature(Window.FEATURE_NO_TITLE);
+    // Show the action bar (or nothing at all).
+    ApiAdapterFactory.getApiAdapter().showActionBar(this);
+
     setContentView(R.layout.mytracks_charts);
     ViewGroup layout = (ViewGroup) findViewById(R.id.elevation_chart);
     chartView = new ChartView(this);
@@ -183,25 +183,6 @@ public class ChartActivity extends Activity implements TrackDataListener {
     }
   }
 
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    super.onCreateOptionsMenu(menu);
-    chartSettingsMenuItem = menu.add(Menu.NONE, Constants.MENU_CHART_SETTINGS, Menu.NONE,
-        R.string.menu_chart_view_chart_settings);
-    chartSettingsMenuItem.setIcon(R.drawable.chart_settings);
-    return true;
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case Constants.MENU_CHART_SETTINGS:
-        showDialog(CHART_SETTINGS_DIALOG);
-        return true;
-    }
-    return super.onOptionsItemSelected(item);
-  }
-
   @Override
   protected Dialog onCreateDialog(int id) {
     if (id == CHART_SETTINGS_DIALOG) {
@@ -486,11 +467,6 @@ public class ChartActivity extends Activity implements TrackDataListener {
     return chartView;
   }
 
-  @VisibleForTesting
-  MenuItem getChartSettingsMenuItem() {
-    return chartSettingsMenuItem;
-  }
-  
   @VisibleForTesting
   void setTrackMaxSpeed(double maxSpeed) {
     trackMaxSpeed = maxSpeed;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/Constants.java b/MyTracks/src/com/google/android/apps/mytracks/Constants.java
index baf59c835..237819697 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/Constants.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/Constants.java
@@ -40,14 +40,6 @@ public abstract class Constants {
   public static final int SHOW_WAYPOINT = 1;
   public static final int WELCOME = 2;
 
-  /*
-   * Menu ids:
-   */
-
-  public static final int MENU_MY_LOCATION = 1;
-  public static final int MENU_TOGGLE_LAYERS = 2;
-  public static final int MENU_CHART_SETTINGS = 3;
-
   /*
    * Context menu ids. Sorted alphabetically.
    */
@@ -69,6 +61,13 @@ public abstract class Constants {
   public static final int MENU_SHARE_TCX_FILE = 115;
   public static final int MENU_SHOW = 116;
   public static final int MENU_WRITE_TO_SD_CARD = 117;
+  /*
+   * Main screen tab tags:
+   */
+
+  public static final String MAP_TAB_TAG = "map";
+  public static final String STATS_TAB_TAG = "stats";
+  public static final String CHART_TAB_TAG = "chart";
 
   /**
    * The number of distance readings to smooth to get a stable signal.
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
index de825ded0..96e309689 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
@@ -29,6 +29,7 @@ import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileForm
 import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
 import com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity;
 import com.google.android.apps.mytracks.stats.TripStatistics;
+import com.google.android.apps.mytracks.util.ApiAdapterFactory;
 import com.google.android.apps.mytracks.util.GeoRect;
 import com.google.android.apps.mytracks.util.LocationUtils;
 import com.google.android.apps.mytracks.util.PlayTrackUtils;
@@ -55,7 +56,6 @@ import android.view.MotionEvent;
 import android.view.SubMenu;
 import android.view.View;
 import android.view.View.OnCreateContextMenuListener;
-import android.view.Window;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -90,6 +90,12 @@ public class MapActivity extends com.google.android.maps.MapActivity
    */
   private boolean keepMyLocationVisible;
 
+  /**
+   * True if we've already zoomed into the current location.
+   * Only relevant when {@link #keepMyLocationVisible} is true.
+   */
+  private boolean myLocationWasZoomedIn;
+
   /**
    * The ID of a track on which we want to show a waypoint.
    * The waypoint will be shown as soon as the track is loaded.
@@ -126,9 +132,6 @@ public class MapActivity extends com.google.android.maps.MapActivity
   private LinearLayout busyPane;
   private ImageButton optionsBtn;
 
-  private MenuItem myLocation;
-  private MenuItem toggleLayers;
-
   /**
    * We are not displaying driving directions. Just an arbitrary track that is
    * not associated to any licensed mapping data. Therefore it should be okay to
@@ -159,8 +162,8 @@ public class MapActivity extends com.google.android.maps.MapActivity
     // The volume we want to control is the Text-To-Speech volume
     setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
 
-    // We don't need a window title bar:
-    requestWindowFeature(Window.FEATURE_NO_TITLE);
+    // Show the action bar (or nothing at all).
+    ApiAdapterFactory.getApiAdapter().showActionBar(this);
 
     // Inflate the layout:
     setContentView(R.layout.mytracks_layout);
@@ -288,6 +291,18 @@ public class MapActivity extends com.google.android.maps.MapActivity
     return r.contains(geoPoint);
   }
 
+  /**
+   * Centers (and keeps centered) the map on the current location.
+   */
+  public void showMyLocation() {
+    dataHub.forceUpdateLocation();
+    keepMyLocationVisible = true;
+    myLocationWasZoomedIn = false;
+    if (currentLocation != null) {
+      showCurrentLocation();
+    }
+  }
+
   /**
    * Moves the location pointer to the current location and center the map if
    * the current location is outside the visible area.
@@ -304,6 +319,11 @@ public class MapActivity extends com.google.android.maps.MapActivity
       GeoPoint geoPoint = LocationUtils.getGeoPoint(currentLocation);
       MapController controller = mapView.getController();
       controller.animateTo(geoPoint);
+      if (!myLocationWasZoomedIn && mapView.getZoomLevel() < 18) {
+        // Only zoom in the first time we show the location.
+        myLocationWasZoomedIn = true;
+        controller.setZoom(18);
+      }
     }
   }
 
@@ -561,45 +581,18 @@ public class MapActivity extends com.google.android.maps.MapActivity
     startActivity(intent);
   }
 
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    super.onCreateOptionsMenu(menu);
-    myLocation = menu.add(
-        Menu.NONE, Constants.MENU_MY_LOCATION, Menu.NONE, R.string.menu_map_view_my_location);
-    myLocation.setIcon(android.R.drawable.ic_menu_mylocation);
-    toggleLayers = menu.add(
-        Menu.NONE, Constants.MENU_TOGGLE_LAYERS, Menu.NONE, R.string.menu_map_view_satellite_mode);
-    toggleLayers.setIcon(android.R.drawable.ic_menu_mapmode);
-    return true;
+  /**
+   * Returns whether the map is currently in satellite view mode.
+   */
+  public boolean isSatelliteView() {
+    return mapView.isSatellite();
   }
 
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    toggleLayers.setTitle(mapView.isSatellite() ?
-        R.string.menu_map_view_map_mode : R.string.menu_map_view_satellite_mode);
-    return super.onPrepareOptionsMenu(menu);
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case Constants.MENU_MY_LOCATION: {
-        dataHub.forceUpdateLocation();
-        keepMyLocationVisible = true;
-        if (mapView.getZoomLevel() < 18) {
-          mapView.getController().setZoom(18);
-        }
-        if (currentLocation != null) {
-          showCurrentLocation();
-        }
-        return true;
-      }
-      case Constants.MENU_TOGGLE_LAYERS: {
-        mapView.setSatellite(!mapView.isSatellite());
-        return true;
-      }
-    }
-    return super.onOptionsItemSelected(item);
+  /**
+   * Changes whether the map should be in satellite view mode.
+   */
+  public void setSatelliteView(boolean sat) {
+    mapView.setSatellite(sat);
   }
 
   @Override
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
index 52dcf2c25..90480c3ab 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
@@ -15,6 +15,9 @@
  */
 package com.google.android.apps.mytracks;
 
+import static com.google.android.apps.mytracks.Constants.CHART_TAB_TAG;
+import static com.google.android.apps.mytracks.Constants.MAP_TAB_TAG;
+
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
@@ -30,11 +33,19 @@ import android.view.MenuItem;
 class MenuManager {
 
   private final MyTracks activity;
-
+  private MenuItem recordTrack;
+  private MenuItem stopRecording;
+  
   public MenuManager(MyTracks activity) {
     this.activity = activity;
   }
 
+  /**
+   * Fills the menu with its initial options.
+   *
+   * @param menu the menu to fill
+   * @return true on success, false otherwise
+   */
   public boolean onCreateOptionsMenu(Menu menu) {
     activity.getMenuInflater().inflate(R.menu.main, menu);
 
@@ -42,26 +53,70 @@ class MenuManager {
     return true;
   }
 
+  /**
+   * Prepares the menu for display.
+   *
+   * @param menu the menu to update for display
+   * @param hasRecorded whether any track has been recorded
+   * @param isRecording whether we're recording a track now
+   * @param hasSelectedTrack whether there's a track currently selected for display
+   * @param isSatelliteMode whether the map is currently in satellite mode
+   * @param currentTabTag the tag for the currently-displayed tab
+   */
   public void onPrepareOptionsMenu(Menu menu, boolean hasRecorded,
-      boolean isRecording, boolean hasSelectedTrack) {
+      boolean isRecording, boolean hasSelectedTrack,
+      boolean isSatelliteMode, String currentTabTag) {
     menu.findItem(R.id.menu_markers)
         .setEnabled(hasRecorded && hasSelectedTrack);
-    menu.findItem(R.id.menu_record_track)
-        .setEnabled(!isRecording)
-        .setVisible(!isRecording);
-    menu.findItem(R.id.menu_stop_recording)
-        .setEnabled(isRecording)
-        .setVisible(isRecording);
+    
+    recordTrack = menu.findItem(R.id.menu_record_track);
+    stopRecording = menu.findItem(R.id.menu_stop_recording);
+    updateActionItems(isRecording);
+    
+    menu.findItem(R.id.menu_chart_settings)
+        .setVisible(CHART_TAB_TAG.equals(currentTabTag));
+
+    boolean isMapTab = MAP_TAB_TAG.equals(currentTabTag);
+    menu.findItem(R.id.menu_my_location)
+        .setVisible(isMapTab);
+    menu.findItem(R.id.menu_satellite_mode)
+        .setVisible(isMapTab)
+        .setTitle(isSatelliteMode
+            ? R.string.menu_map_view_map_mode
+            : R.string.menu_map_view_satellite_mode);
   }
 
+  /**
+   * Updates the action items.<br>
+   * TODO: also update the action items when
+   * <ul>
+   * <li>start/stop a recording from the home screen widget.<il>
+   * <li>receive a direct service call to start/stop a recording.<il>
+   * </ul>
+   *
+   * @param isRecording true if recording a track
+   */
+  private void updateActionItems(boolean isRecording) {
+    recordTrack.setEnabled(!isRecording).setVisible(!isRecording);
+    stopRecording.setEnabled(isRecording).setVisible(isRecording);
+  }
+
+  /**
+   * Called when an option from the menu is selected.
+   *
+   * @param item the selected item
+   * @return true if the action was handled, false otherwise
+   */
   public boolean onOptionsItemSelected(MenuItem item) {
     switch (item.getItemId()) {
       case R.id.menu_record_track: {
         activity.startRecording();
+        updateActionItems(true);
         return true;
       }
       case R.id.menu_stop_recording: {
         activity.stopRecording();
+        updateActionItems(false);
         return true;
       }
       case R.id.menu_tracks: {
@@ -90,11 +145,28 @@ class MenuManager {
       case R.id.menu_search: {
         // TODO: Pass the current track ID and current location to do some fancier ranking.
         activity.onSearchRequested();
+        return true;
+      }
+      case R.id.menu_chart_settings: {
+        activity.showChartSettings();
+        return true;
+      }
+      case R.id.menu_my_location: {
+        activity.showMyLocation();
+        return true;
+      }
+      case R.id.menu_satellite_mode: {
+        activity.toggleSatelliteView();
+        return true;
       }
     }
+
     return false;
   }
 
+  /**
+   * Starts an activity with the given class.
+   */
   private boolean startActivity(Class<? extends Activity> activityClass) {
     activity.startActivity(new Intent(activity, activityClass));
     return true;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index 3868cf75e..e820c599a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -15,6 +15,9 @@
  */
 package com.google.android.apps.mytracks;
 
+import static com.google.android.apps.mytracks.Constants.CHART_TAB_TAG;
+import static com.google.android.apps.mytracks.Constants.MAP_TAB_TAG;
+import static com.google.android.apps.mytracks.Constants.STATS_TAB_TAG;
 import static com.google.android.apps.mytracks.Constants.TAG;
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
@@ -54,7 +57,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnTouchListener;
 import android.view.ViewGroup.LayoutParams;
-import android.view.Window;
 import android.widget.RelativeLayout;
 import android.widget.TabHost;
 import android.widget.Toast;
@@ -148,23 +150,23 @@ public class MyTracks extends TabActivity implements OnTouchListener {
     serviceConnection = new TrackRecordingServiceConnection(this, serviceBindCallback);
 
     setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
-
-    // We don't need a window title bar:
-    requestWindowFeature(Window.FEATURE_NO_TITLE);
+    
+    // Show the action bar (or nothing at all).
+    ApiAdapterFactory.getApiAdapter().showActionBar(this);
 
     // If the user just starts typing (on a device with a keyboard), we start a search.
     setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
 
     final Resources res = getResources();
     final TabHost tabHost = getTabHost();
-    tabHost.addTab(tabHost.newTabSpec("tab1")
+    tabHost.addTab(tabHost.newTabSpec(MAP_TAB_TAG)
         .setIndicator("Map", res.getDrawable(
             android.R.drawable.ic_menu_mapmode))
         .setContent(new Intent(this, MapActivity.class)));
-    tabHost.addTab(tabHost.newTabSpec("tab2")
+    tabHost.addTab(tabHost.newTabSpec(STATS_TAB_TAG)
         .setIndicator("Stats", res.getDrawable(R.drawable.menu_stats))
         .setContent(new Intent(this, StatsActivity.class)));
-    tabHost.addTab(tabHost.newTabSpec("tab3")
+    tabHost.addTab(tabHost.newTabSpec(CHART_TAB_TAG)
         .setIndicator("Chart", res.getDrawable(R.drawable.menu_elevation))
         .setContent(new Intent(this, ChartActivity.class)));
 
@@ -298,9 +300,15 @@ public class MyTracks extends TabActivity implements OnTouchListener {
 
   @Override
   public boolean onPrepareOptionsMenu(Menu menu) {
+    MapActivity map = getMapTab();
+    boolean isSatelliteView = map != null ? map.isSatelliteView() : false;
+
     menuManager.onPrepareOptionsMenu(menu, providerUtils.getLastTrack() != null,
         ServiceUtils.isRecording(this, serviceConnection.getServiceIfBound(), preferences),
-        dataHub.isATrackSelected());
+        dataHub.isATrackSelected(),
+        isSatelliteView,
+        getTabHost().getCurrentTabTag());
+
     return super.onPrepareOptionsMenu(menu);
   }
 
@@ -362,7 +370,11 @@ public class MyTracks extends TabActivity implements OnTouchListener {
         if (results != null) {
           final long waypointId = results.getLongExtra(WaypointDetails.WAYPOINT_ID_EXTRA, -1);
           if (waypointId >= 0) {
-            showWaypoint(trackId, waypointId);
+            MapActivity map = getMapTab();
+            if (map != null) {
+              getTabHost().setCurrentTab(0);
+              map.showWaypoint(waypointId);
+            }
           }
         }
         break;
@@ -486,4 +498,48 @@ public class MyTracks extends TabActivity implements OnTouchListener {
   long getSelectedTrackId() {
     return dataHub.getSelectedTrackId();
   }
+
+  /**
+   * Asks the chart tab to show its settings.
+   */
+  public void showChartSettings() {
+    ChartActivity chart = getChartTab();
+    if (chart != null) {
+      chart.showDialog(ChartActivity.CHART_SETTINGS_DIALOG);
+    }
+  }
+
+  /**
+   * Asks the map tab to show the map in satellite mode.
+   */
+  public void toggleSatelliteView() {
+    MapActivity mapTab = getMapTab();
+    if (mapTab != null) {
+      mapTab.setSatelliteView(!mapTab.isSatelliteView());
+    }
+  }
+
+  /**
+   * Asks the map tab to jump to the current location.
+   */
+  public void showMyLocation() {
+    MapActivity mapTab = getMapTab();
+    if (mapTab != null) {
+      mapTab.showMyLocation();
+    }
+  }
+
+  /**
+   * Returns the map tab instance if available, or null otherwise.
+   */
+  private MapActivity getMapTab() {
+    return (MapActivity) getLocalActivityManager().getActivity(MAP_TAB_TAG);
+  }
+
+  /**
+   * Returns the chart tab instance if available, or null otherwise.
+   */
+  private ChartActivity getChartTab() {
+    return (ChartActivity) getLocalActivityManager().getActivity(CHART_TAB_TAG);
+  }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
index 253f51d82..039091cdf 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
@@ -23,6 +23,7 @@ import com.google.android.apps.mytracks.content.TrackDataHub.ListenerDataType;
 import com.google.android.apps.mytracks.content.TrackDataListener;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.services.ServiceUtils;
+import com.google.android.apps.mytracks.util.ApiAdapterFactory;
 import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
 
@@ -34,7 +35,6 @@ import android.os.Bundle;
 import android.speech.tts.TextToSpeech;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.view.Window;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
@@ -107,8 +107,8 @@ public class StatsActivity extends Activity implements TrackDataListener {
     // The volume we want to control is the Text-To-Speech volume
     setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
 
-    // We don't need a window title bar:
-    requestWindowFeature(Window.FEATURE_NO_TITLE);
+     // Show the action bar (or nothing at all).
+    ApiAdapterFactory.getApiAdapter().showActionBar(this);
 
     setContentView(R.layout.stats);
 
@@ -117,7 +117,7 @@ public class StatsActivity extends Activity implements TrackDataListener {
 
     showUnknownLocation();
     updateLabels();
-    
+
     DisplayMetrics metrics = new DisplayMetrics();
     getWindowManager().getDefaultDisplay().getMetrics(metrics);
     if (metrics.heightPixels > 600) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java
new file mode 100644
index 000000000..d0527c63b
--- /dev/null
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+package com.google.android.apps.mytracks.util;
+
+import android.app.Activity;
+import android.view.Window;
+
+/**
+ * API level 11 specific implementation of the {@link ApiAdapter}.
+ *
+ * @author Jimmy Shih
+ */
+public class Api11Adapter extends Api9Adapter {
+
+  @Override
+  public void showActionBar(Activity activity) {
+    activity.requestWindowFeature(Window.FEATURE_ACTION_BAR);
+  }
+}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api7Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api7Adapter.java
index 6b572d045..1d6a6e8bd 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/Api7Adapter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api7Adapter.java
@@ -23,12 +23,14 @@ import com.google.android.apps.mytracks.services.tasks.StatusAnnouncerTask;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.apache.ApacheHttpTransport;
 
+import android.app.Activity;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothSocket;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.util.Log;
+import android.view.Window;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -50,7 +52,7 @@ public class Api7Adapter implements ApiAdapter {
   public BackupPreferencesListener getBackupPreferencesListener(Context context) {
     return new BackupPreferencesListener() {
       @Override
-      public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {        
+      public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         // Do nothing
       }
     };
@@ -65,7 +67,7 @@ public class Api7Adapter implements ApiAdapter {
   public void enableStrictMode() {
     // Not supported
   }
-  
+
   @Override
   public byte[] copyByteArray(byte[] input, int start, int end) {
     int length = end - start;
@@ -73,7 +75,7 @@ public class Api7Adapter implements ApiAdapter {
     System.arraycopy(input, start, output, 0, length);
     return output;
   }
-  
+
   @Override
   public HttpTransport getHttpTransport() {
     return new ApacheHttpTransport();
@@ -99,4 +101,11 @@ public class Api7Adapter implements ApiAdapter {
     }
     return bluetoothDevice.createRfcommSocketToServiceRecord(BluetoothConnectionManager.SPP_UUID);
   }
+
+  @Override
+  public void showActionBar(Activity activity) {
+    // Action bar not available, just hide the title and let actions be shown
+    // via the regular menu.
+    activity.requestWindowFeature(Window.FEATURE_NO_TITLE);
+  }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java
index 868c43af1..87ea57ab6 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java
@@ -19,6 +19,7 @@ import com.google.android.apps.mytracks.io.backup.BackupPreferencesListener;
 import com.google.android.apps.mytracks.services.tasks.PeriodicTask;
 import com.google.api.client.http.HttpTransport;
 
+import android.app.Activity;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothSocket;
 import android.content.Context;
@@ -98,4 +99,15 @@ public interface ApiAdapter {
    * @param bluetoothDevice
    */
   public BluetoothSocket getBluetoothSocket(BluetoothDevice bluetoothDevice) throws IOException;
+  
+ /**
+   * Shows the action bar, if the current system supports it.
+   * If it's not supported, the title bar will be kept hidden.
+   *
+   * Due to changes in API level 11.
+   *
+   * @param activity the current activity
+   */
+  public void showActionBar(Activity activity);
+
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapterFactory.java b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapterFactory.java
index 5af16534e..43ff5ee65 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapterFactory.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapterFactory.java
@@ -31,7 +31,10 @@ public class ApiAdapterFactory {
    */
   public static ApiAdapter getApiAdapter() {
     if (apiAdapter == null) {
-      if (Build.VERSION.SDK_INT >= 10) {
+      if (Build.VERSION.SDK_INT >= 11) {
+        apiAdapter = new Api11Adapter();
+        return apiAdapter;
+      } else if (Build.VERSION.SDK_INT >= 10) {
         apiAdapter = new Api10Adapter();
         return apiAdapter;
       } else if (Build.VERSION.SDK_INT >= 9) {
diff --git a/MyTracksLib/AndroidManifest.xml b/MyTracksLib/AndroidManifest.xml
index ddbe1b69c..34a51462d 100644
--- a/MyTracksLib/AndroidManifest.xml
+++ b/MyTracksLib/AndroidManifest.xml
@@ -15,16 +15,22 @@ 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"
+  package="com.google.android.apps.mytracks.lib" >
+
   <!--
      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"
+    android:targetSdkVersion="15" />
+
 </manifest>
\ No newline at end of file
diff --git a/MyTracksTest/AndroidManifest.xml b/MyTracksTest/AndroidManifest.xml
index 113e39ba2..e1479313f 100644
--- a/MyTracksTest/AndroidManifest.xml
+++ b/MyTracksTest/AndroidManifest.xml
@@ -1,14 +1,37 @@
 <?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"
+    android:targetSdkVersion="15" />
+
 </manifest>
\ No newline at end of file
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/ChartActivityTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/ChartActivityTest.java
index 9076c6f78..1ed95955a 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/ChartActivityTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/ChartActivityTest.java
@@ -20,12 +20,10 @@ import com.google.android.apps.mytracks.content.Sensor;
 import com.google.android.apps.mytracks.content.Sensor.SensorDataSet;
 import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
-import com.jayway.android.robotium.solo.Solo;
 
 import android.app.Instrumentation;
 import android.location.Location;
 import android.test.ActivityInstrumentationTestCase2;
-import android.view.KeyEvent;
 import android.view.View;
 import android.widget.ZoomControls;
 
@@ -38,7 +36,6 @@ public class ChartActivityTest extends ActivityInstrumentationTestCase2<ChartAct
 
   private Instrumentation instrumentation;
   private ChartActivity chartActivity;
-  private Solo solo;
   private View zoomIn;
   private View zoomOut;
   private int currentZoomLevel;
@@ -104,27 +101,6 @@ public class ChartActivityTest extends ActivityInstrumentationTestCase2<ChartAct
     assertEquals(false, zoomOut.isEnabled());
   }
 
-  /**
-   * There are two parts in this test. Tests
-   * {@link ChartActivity#onCreateDialog(int)} which includes the logic to create
-   * {@link ChartSettingsDialog}.
-   */
-  public void testCreateSettingDialog() {
-    solo = new Solo(instrumentation, chartActivity);
-    // Part1, tests {@link ChartActivity#onCreateOptionsMenu()}. Check if
-    // optional menu is created.
-    assertNull(chartActivity.getChartSettingsMenuItem());
-    sendKeys(KeyEvent.KEYCODE_MENU);
-    assertNotNull(chartActivity.getChartSettingsMenuItem());
-
-    // Part2, tests {@link ChartActivity#onOptionsItemSelected()}. Clicks on the
-    // "Chart settings", and then verify that the dialog contains the
-    // "By distance" text.
-    solo.clickOnText(chartActivity.getString(R.string.menu_chart_view_chart_settings));
-    instrumentation.waitForIdleSync();
-    assertTrue(solo.searchText(chartActivity.getString(R.string.chart_settings_by_distance)));
-  }
-
   /**
    * Tests the logic to get the incorrect values of sensor in {@link
    * ChartActivity#fillDataPoint(Location, double[])}.