Update privacy url

Fix unit tests breakage.
Update strings for release 1.1.16.
2026-10-24 11:15:18 +02:00 · 2012-03-16 17:34:08 -07:00 · 2012-03-14 16:52:25 -07:00 · 2012-03-14 15:45:12 -07:00 · 2012-03-14 15:37:22 -07:00 · 2012-03-14 15:17:55 -07:00
313 changed files with 15349 additions and 10388 deletions
@@ -17,177 +17,8 @@ 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="35"
+          android:versionCode="39"
-          android:versionName="1.1.12">
+          android:versionName="1.1.16">
  <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" />
    <meta-data android:name="com.google.android.backup.api_key"
               android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
    <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: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" />
      </intent-filter>
    </activity>
    <activity android:name="com.google.android.apps.mytracks.MapActivity"
              android:exported="false">
      <intent-filter>
        <category android:name="android.intent.category.TAB" />
      </intent-filter>
    </activity>
    <activity android:name="com.google.android.apps.mytracks.MyMapsList"
              android:label="@string/my_maps_list_title"
              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale"
              android:exported="false" />
    <!-- TODO: VIEW and PICK for track cursor dir -->
    <activity android:name="com.google.android.apps.mytracks.TrackList" />
    <!-- TODO: VIEW and PICK for waypoint cursor dir -->
    <activity android:name="com.google.android.apps.mytracks.WaypointsList" />
    <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.VIEW" />
        <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" >
      <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>
        <category android:name="android.intent.category.TAB" />
      </intent-filter>
    </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">
      <intent-filter>
        <category android:name="android.intent.category.TAB" />
      </intent-filter>
    </activity>
    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.SendActivity"
              android:theme="@android:style/Theme.Translucent.NoTitleBar">
      <intent-filter>
        <action android:name="android.intent.action.SEND" />
        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
      </intent-filter>
    </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.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" />
        <data android:mimeType="application/gpx" />
        <data android:mimeType="application/vnd.google-earth.gpx" />
        <data android:mimeType="application/vnd.google-earth.gpx+xml" />
      </intent-filter>
    </activity>
    <activity android:name="com.google.android.apps.mytracks.WelcomeActivity"
              android:label="@string/welcome_title"
              android:exported="false" />
    <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" />
    <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>
        <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" />
    </receiver>
  </application>
  <!-- Permissions to initialize service -->
  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -217,6 +48,7 @@ limitations under the License.
  <!-- 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 -->
@@ -264,11 +96,219 @@ limitations under the License.
  <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="3"/>
+  <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">
    <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>
        <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>
    <!-- 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" >
      <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>
        <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.SensorStateActivity"
              android:label="@string/menu_sensor_state" />
    <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.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" />
        <data android:mimeType="application/gpx" />
        <data android:mimeType="application/vnd.google-earth.gpx" />
        <data android:mimeType="application/vnd.google-earth.gpx+xml" />
      </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">
      <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: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: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">
      <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>
        <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" />
    </receiver>
  </application>
 </manifest>
@@ -0,0 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
    <issue id="AdapterViewChildren" severity="error" />
    <issue id="DuplicateIds" severity="error" />
    <issue id="DuplicateIncludedIds" severity="error" />
    <issue id="ExtraTranslation" severity="error" />
    <issue id="GifUsage" severity="error" />
    <issue id="InconsistentArrays" severity="error" />
    <issue id="MissingTranslation" severity="warning" />
    <issue id="Proguard" severity="warning" />
    <issue id="ScrollViewCount" severity="error" />
    <issue id="ScrollViewSize" severity="error" />
    <issue id="StateListReachable" severity="error" />
    <issue id="TypographyDashes" severity="informational" />
    <issue id="TypographyEllipsis" severity="informational" />
    <issue id="TypographyFractions" severity="informational" />
    <issue id="TypographyOther" severity="informational" />
    <issue id="TypographyQuotes" severity="informational" />
 </lint>
@@ -11,5 +11,5 @@
 split.density=false
 proguard.config=proguard.cfg
 # Project target.
-target=Google Inc.:Google APIs:14
+target=Google Inc.:Google APIs:15
 android.library.reference.1=../MyTracksLib
@@ -17,87 +17,85 @@ limitations under the License.
 <ScrollView
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_height="wrap_content"
-  android:layout_width="wrap_content">  
+  android:layout_width="fill_parent">
-  <TableLayout
+  <LinearLayout
    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
+    android:layout_width="fill_parent"
-    android:padding="2dp"
+    android:orientation="vertical"
-    android:shrinkColumns="0"
+    android:padding="10dp">
-    android:stretchColumns="1">
+
-    <TableRow style="@style/AboutTableRow">
+    <!-- Title -->
    <LinearLayout
      android:layout_height="wrap_content"
      android:layout_width="fill_parent"
      android:orientation="horizontal">
      <ImageView
-        android:layout_column="0"
+        android:layout_gravity="center_vertical"
-        android:scaleType="center"
+        android:layout_height="wrap_content"
        android:layout_width="wrap_content"
        android:src="@drawable/arrow_icon"/>
      <LinearLayout
        android:layout_column="1"
        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
        android:orientation="vertical">
        <TextView
          android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
+          android:layout_width="fill_parent"
          android:text="@string/my_tracks_app_name"
-          android:textSize="30sp" />
+          android:textSize="30sp"/>
        <TextView
          android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
+          android:layout_width="fill_parent"
          android:text="@string/about_copyright_notice"
-          android:textSize="15sp" />
+          android:textSize="16sp"/>
      </LinearLayout>
-    </TableRow>
+    </LinearLayout>
-    <TableRow style="@style/AboutTableRow">
+
-      <TextView
+    <!-- Team -->
-        android:text="@string/about_team"
+    <TextView
-        style="@style/AboutTextView.Column0"/>
+      android:text="@string/about_team"
-      <LinearLayout
+      style="@style/AboutLabel"/>
-        android:layout_column="1"
+    <TextView
-        android:layout_height="wrap_content"
+      android:text="@string/about_bart"
-        android:layout_width="wrap_content"
+      style="@style/AboutItem"/>
-        android:orientation="vertical">
+    <TextView
-        <TextView
+      android:text="@string/about_dylan"
-          android:text="@string/about_bart"
+      style="@style/AboutItem"/>
-          style="@style/AboutTextView"/>
+    <TextView
-        <TextView
+      android:text="@string/about_jimmy"
-          android:text="@string/about_dylan"
+      style="@style/AboutItem"/>
-          style="@style/AboutTextView"/>
+    <TextView
-        <TextView
+      android:text="@string/about_leif"
-          android:text="@string/about_jimmy"
+      style="@style/AboutItem"/>
-          style="@style/AboutTextView"/>
+    <TextView
-        <TextView
+      android:text="@string/about_rodrigo"
-          android:text="@string/about_leif"
+      style="@style/AboutItem"/>
-          style="@style/AboutTextView"/>
+    <TextView
-        <TextView
+      android:text="@string/about_sandor"
-          android:text="@string/about_rodrigo"
+      style="@style/AboutItem"/>
-          style="@style/AboutTextView"/>
+  
-        <TextView
+    <!-- Version -->
-          android:text="@string/about_sandor"
+    <TextView
-          style="@style/AboutTextView"/>
+      android:text="@string/about_version"
-      </LinearLayout>
+      style="@style/AboutLabel"/>
-    </TableRow>
+    <TextView
-    <TableRow style="@style/AboutTableRow">
+      android:id="@+id/about_version"
-      <TextView
+      style="@style/AboutItem"/>
-        android:text="@string/about_version"
+
-        style="@style/AboutTextView.Column0"/>
+    <!-- Support -->
-      <TextView
+    <TextView
-        android:id="@+id/about_version"
+      android:text="@string/about_support"
-        style="@style/AboutTextView"/>
+      style="@style/AboutLabel"/>
-    </TableRow>
+    <TextView
-    <TableRow style="@style/AboutTableRow">
+      android:text="@string/my_tracks_support_url"
-      <TextView
+      style="@style/AboutUrl"/>
-        android:text="@string/about_support"
+
-        style="@style/AboutTextView.Column0"/>
+    <!--  Privacy -->
-      <TextView
+    <TextView
-        android:text="@string/my_tracks_web_url"
+      android:text="@string/about_privacy"
-        style="@style/AboutTextView.Url"/>
+      style="@style/AboutLabel"/>
-    </TableRow>  
+    <TextView
-    <TableRow style="@style/AboutTableRow">
+      android:text="@string/my_tracks_privacy_url"
-      <TextView
+      style="@style/AboutUrl"/>
-        android:text="@string/about_privacy"
+  </LinearLayout>
        style="@style/AboutTextView.Column0"/>
      <TextView
        android:text="@string/my_tracks_privacy_url"
        style="@style/AboutTextView.Url"/>
    </TableRow>
  </TableLayout>
 </ScrollView>
@@ -17,120 +17,90 @@ limitations under the License.
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_height="fill_parent"
  android:layout_width="fill_parent"
  android:minWidth="300dp"
  android:orientation="vertical">
-  <LinearLayout
+  <TableLayout
    android:background="@drawable/list_bar"
    android:layout_height="wrap_content"
-    android:layout_width="fill_parent">
+    android:layout_width="fill_parent"
-    <TextView
+    android:shrinkColumns="0"
-      android:layout_height="wrap_content"
+    android:stretchColumns="0">
-      android:layout_marginLeft="10dp"
+    <TableRow>
-      android:layout_width="fill_parent"
+      <TextView
-      android:text="@string/menu_chart_view_chart_settings"
+        android:background="@drawable/list_bar"
-      android:textColor="#fff"
+        android:layout_height="wrap_content"
-      android:textSize="20sp"/>
+        android:layout_width="fill_parent"
-  </LinearLayout>
+        android:paddingLeft="10dp"
        android:text="@string/menu_chart_view_chart_settings"
        android:textColor="@color/white"
        android:textSize="20sp"/>
    </TableRow>
  </TableLayout>
  <ScrollView
    android:layout_height="0dp"
    android:layout_weight="1"
    android:layout_width="fill_parent">
-    <TableLayout
+    <LinearLayout 
      android:layout_height="wrap_content"
      android:layout_marginLeft="5dp"
      android:layout_marginTop="5dp"
      android:layout_width="fill_parent"
-      android:stretchColumns="1">
+      android:orientation="vertical"
-      <TableRow>
+      android:padding="10dp">
-        <LinearLayout
+      
-          android:layout_height="wrap_content"
+      <!-- X axis -->
-          android:layout_marginLeft="10dp"
+      <LinearLayout style="@style/ChartSettingsAxisLayout">
-          android:layout_width="fill_parent"
+        <ImageView
-          android:orientation="vertical">
+          android:src="@drawable/x_axis"
-          <LinearLayout
+          style="@style/ChartSettingsAxisImage"/>
-            android:layout_height="wrap_content"
+        <TextView
-            android:layout_width="fill_parent"
+          android:text="@string/chart_settings_x_axis"
-            android:orientation="horizontal">
+          style="@style/ChartSettingsAxisText"/>
-            <ImageView
+      </LinearLayout>
-              android:layout_height="wrap_content"
+
-              android:layout_width="wrap_content"
+      <RadioGroup
-              android:src="@drawable/x_axis"/>
+        android:id="@+id/chart_settings_x"
-            <TextView
+        android:layout_height="wrap_content"
-              android:layout_height="wrap_content"
+        android:layout_width="fill_parent">
-              android:layout_width="fill_parent"
+        <RadioButton
-              android:text="@string/chart_settings_x_axis"
+          android:id="@+id/chart_settings_by_distance"
-              android:textSize="20sp"/>
+          android:text="@string/chart_settings_by_distance"
-          </LinearLayout>
+          style="@style/ChartSettingsRadioButton"/>
-          <RadioGroup
+        <RadioButton
-            android:id="@+id/chart_settings_x"
+          android:id="@+id/chart_settings_by_time"
-            android:layout_height="wrap_content"
+          android:text="@string/chart_settings_by_time"
-            android:layout_width="fill_parent">
+          style="@style/ChartSettingsRadioButton"/>
-            <RadioButton
+      </RadioGroup>
-              android:id="@+id/chart_settings_by_distance"
+
-              android:layout_height="wrap_content"
+      <!-- Y axis -->
-              android:layout_width="fill_parent"
+      <LinearLayout
-              android:text="@string/chart_settings_by_distance"/>
+        android:paddingTop="10dp"
-            <RadioButton
+        style="@style/ChartSettingsAxisLayout">
-              android:id="@+id/chart_settings_by_time"
+        <ImageView
-              android:layout_height="wrap_content"
+          android:src="@drawable/y_axis"
-              android:layout_width="fill_parent"
+          style="@style/ChartSettingsAxisImage"/>
-              android:text="@string/chart_settings_by_time"/>
+        <TextView
-          </RadioGroup>
+          android:text="@string/chart_settings_y_axis"
-        </LinearLayout>
+          style="@style/ChartSettingsAxisText"/>
-      </TableRow>
+      </LinearLayout>
-      <TableRow>
+
-        <LinearLayout
+      <CheckBox
-          android:layout_height="wrap_content"
+        android:id="@+id/chart_settings_elevation"
-          android:layout_marginLeft="10dp"
+        android:text="@string/stat_elevation"
-          android:layout_width="fill_parent"
+        style="@style/ChartSettingsCheckbox"/>
-          android:orientation="vertical">
+      <CheckBox
-          <LinearLayout
+        android:id="@+id/chart_settings_speed"
-            android:layout_height="wrap_content"
+        android:text="@string/stat_speed"
-            android:layout_width="fill_parent"
+        style="@style/ChartSettingsCheckbox"/>
-            android:orientation="horizontal">
+      <CheckBox
-            <ImageView
+        android:id="@+id/chart_settings_power"
-              android:layout_height="wrap_content"
+        android:text="@string/sensor_state_power"
-              android:layout_width="wrap_content"
+        style="@style/ChartSettingsCheckbox"/>
-              android:src="@drawable/y_axis"/>
+      <CheckBox
-            <TextView
+        android:id="@+id/chart_settings_cadence"
-              android:layout_height="wrap_content"
+        android:text="@string/sensor_state_cadence"
-              android:layout_width="fill_parent"
+        style="@style/ChartSettingsCheckbox"/>
-              android:text="@string/chart_settings_y_axis"
+      <CheckBox
-              android:textSize="20sp" />
+        android:id="@+id/chart_settings_heart_rate"
-          </LinearLayout>
+        android:text="@string/sensor_state_heart_rate"
-          <CheckBox
+        style="@style/ChartSettingsCheckbox"/>
-            android:id="@+id/chart_settings_elevation"
+    </LinearLayout>
            android:checked="true"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:text="@string/stat_elevation"/>
          <CheckBox
            android:id="@+id/chart_settings_speed"
            android:checked="true"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:text="@string/stat_speed"/>
          <CheckBox
            android:id="@+id/chart_settings_power"
            android:checked="true"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:text="@string/sensor_state_power"/>
          <CheckBox
            android:id="@+id/chart_settings_cadence"
            android:checked="true"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:text="@string/sensor_state_cadence"/>
          <CheckBox
            android:id="@+id/chart_settings_heart_rate"
            android:checked="true"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:text="@string/sensor_state_heart_rate"/>
        </LinearLayout>
      </TableRow>
    </TableLayout>
  </ScrollView>
  <LinearLayout style="@style/ButtonLayout">
    <LinearLayout style="@style/ButtonSpacer"/>
@@ -0,0 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright 2010 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.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_height="fill_parent"
  android:layout_width="fill_parent"
  android:orientation="vertical">
  <TextView
    android:background="@drawable/list_bar"
    android:layout_height="wrap_content"
    android:layout_width="fill_parent"
    android:padding="5dp"
    android:text="@string/maps_list_pick_map"
    android:textColor="@color/white"
    android:textSize="16sp"/>
  <ListView
    android:id="@+id/choose_map_list_view"
    android:layout_height="fill_parent"
    android:layout_weight="1"
    android:layout_width="fill_parent"
    android:padding="5dp"/>
  <TextView
    android:id="@+id/choose_map_empty_view"
    android:gravity="center"
    android:layout_height="fill_parent"
    android:layout_weight="1"
    android:layout_width="fill_parent"
    android:padding="5dp"
    android:textColor="@color/red"
    android:textSize="16sp"
    android:textStyle="bold"/>
 </LinearLayout>
@@ -0,0 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright 2010 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.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_height="wrap_content"
  android:layout_width="fill_parent"
  android:orientation="vertical"
  android:paddingBottom="2dp"
  android:paddingTop="2dp">
  <TextView
    android:id="@+id/choose_map_list_item_title"
    android:layout_height="wrap_content"
    android:layout_marginLeft="6dp"
    android:layout_marginTop="6dp"
    android:layout_width="fill_parent"
    android:textColor="@color/white"
    android:textSize="18sp"
    android:textStyle="bold"
    android:singleLine="true"/>
  <TextView
    android:id="@+id/choose_map_list_item_description"
    android:layout_height="wrap_content"
    android:layout_marginLeft="6dp"
    android:layout_width="fill_parent"
    android:textSize="14sp"
    android:singleLine="true"/>
  <TextView
    android:id="@+id/choose_map_list_item_search_status"
    android:layout_height="wrap_content"
    android:layout_marginLeft="6dp"
    android:layout_width="fill_parent"
    android:textSize="14sp"
    android:singleLine="true"/>
 </LinearLayout>
@@ -1,103 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright 2010 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.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apl/res/com.google.android.maps"
  android:orientation="vertical"
  android:layout_width="fill_parent"
  android:layout_height="fill_parent">
  <LinearLayout
    android:orientation="horizontal"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
    android:background="@drawable/list_bar"
    android:layout_weight="0"
    android:padding="3dip">
    <TextView android:id="@+id/message"
      android:layout_width="fill_parent"
      android:layout_height="wrap_content"
      android:textSize="16dip"
      android:textColor="#fff"
      android:text="@string/my_maps_list_pick_map"
      android:layout_weight="0"/>
  </LinearLayout>
  <ListView android:id="@+id/maplist"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
    android:layout_weight="1"/>
    <TextView android:id="@+id/mapslist_empty"
      android:layout_width="fill_parent"
      android:layout_height="fill_parent"
      android:layout_gravity="center"
      android:gravity="center"
      android:padding="3dip"
      android:textSize="16dip"
      android:textColor="#c00"
      android:textStyle="bold"
      android:text="@string/my_maps_list_no_maps"
      android:visibility="gone"/>
    <TextView android:id="@+id/failed"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
    android:layout_gravity="center"
    android:gravity="center"
    android:padding="3dip"
    android:textSize="16dip"
    android:textColor="#c00"
    android:textStyle="bold"
    android:text="@string/my_maps_list_error"
    android:visibility="gone"/>
    <LinearLayout
    android:orientation="horizontal"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
    android:background="@drawable/list_bar"
    android:layout_weight="0"
    android:padding="3dip">
      <LinearLayout android:id="@+id/loading"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:orientation="horizontal"
        android:padding="3dip"
        android:layout_gravity="center">
        <TextView
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:layout_weight="1"/>
        <ProgressBar
          android:layout_height="20dip"
          android:layout_width="20dip"
          android:layout_gravity="center"/>
        <TextView
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:layout_gravity="center"
          android:paddingLeft="3dip"
          android:textSize="16dip"
          android:textColor="#fff"
          android:textStyle="bold"
          android:text="@string/my_maps_list_loading"/>
        <TextView
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:layout_weight="1"/>
      </LinearLayout>
      <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_weight="1"/>
    </LinearLayout>
 </LinearLayout>
@@ -1,40 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright 2010 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.
 -->
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_width="fill_parent"
  android:layout_height="wrap_content"
  android:padding="2dip"
  android:orientation="vertical">
  <TextView android:id="@+id/maplistitem"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
    android:textSize="9pt"
    android:textStyle="bold"
    android:textColor="#fff"
    android:singleLine="true"/>
    <TextView android:id="@+id/maplistdesc"
      android:layout_width="fill_parent"
      android:layout_height="wrap_content"
      android:textSize="8pt"
      android:singleLine="true"/>
    <TextView android:id="@+id/maplistpublic"
      android:layout_width="fill_parent"
      android:layout_height="wrap_content"
      android:textSize="7pt"
      android:singleLine="true"/>
 </LinearLayout>
@@ -15,69 +15,60 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:paddingTop="2dip"
  android:paddingBottom="2dip"
  android:layout_width="fill_parent"
  android:layout_height="wrap_content"
  android:layout_width="fill_parent"
  android:minHeight="?android:attr/listPreferredItemHeight"
-  android:orientation="vertical">
+  android:orientation="vertical"
  android:paddingBottom="2dip"
  android:paddingTop="2dip">
  <LinearLayout
-    android:orientation="horizontal"
+    android:layout_height="wrap_content"
    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
+    android:orientation="horizontal">
-    <ImageView android:id="@+id/trackdetails_item_icon"
+    <ImageView android:id="@+id/track_list_item_icon"
-      android:layout_width="wrap_content"
+      android:contentDescription="@string/track_list_icon_description"
      android:layout_height="wrap_content"
      android:layout_width="wrap_content"
      android:paddingLeft="4dip"
      android:paddingRight="2dip"
      android:paddingTop="5dip"
-      android:src="@drawable/track"/>
+      android:src="@drawable/track" />
-    <LinearLayout
+    <TextView android:id="@+id/track_list_item_name"
-      android:orientation="horizontal"
+      android:layout_height="wrap_content"
      android:layout_marginLeft="6dip"
      android:layout_marginTop="6dip"
      android:layout_width="wrap_content"
      android:singleLine="true"
      android:textAppearance="?android:attr/textAppearanceLarge"/>
    <TextView android:id="@+id/track_list_item_category"
      android:layout_height="wrap_content"
      android:layout_marginLeft="6dip"
      android:layout_marginTop="6dip"
      android:layout_width="fill_parent"
-      android:layout_height="wrap_content">
+      android:singleLine = "true"
-      <TextView android:id="@+id/trackdetails_item_name"
+      android:textAppearance="?android:attr/textAppearanceSmall"/>
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginLeft="6dip"
        android:layout_marginTop="6dip"
        android:singleLine="true"
        android:text="Track name"
        android:textAppearance="?android:attr/textAppearanceLarge"/>
      <TextView android:id="@+id/trackdetails_item_category"
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"
        android:layout_marginLeft="6dip"
        android:layout_marginTop="6dip"
        android:singleLine = "true"
        android:text="Activity type"
        android:textAppearance="?android:attr/textAppearanceSmall"/>
    </LinearLayout>
  </LinearLayout>
-  <TextView android:id="@+id/trackdetails_item_time"
+  <TextView android:id="@+id/track_list_item_time"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
    android:layout_marginLeft="6dip"
    android:singleLine="true"
    android:textColor="#fff"
    android:text="Start time"
    android:textAppearance="?android:attr/textAppearanceSmall"/>
-  <TextView android:id="@+id/trackdetails_item_stats"
+  <TextView android:id="@+id/track_list_item_stats"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
    android:layout_marginLeft="6dip"
    android:singleLine="true"
    android:textColor="#0f0"
    android:text="Distance and total time"
    android:textAppearance="?android:attr/textAppearanceSmall"/>
-  <TextView android:id="@+id/trackdetails_item_description"
+  <TextView android:id="@+id/track_list_item_description"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
    android:layout_marginLeft = "6dip"
    android:singleLine = "false"
    android:text="Description"
    android:textAppearance="?android:attr/textAppearanceSmall"/>
 </LinearLayout>
@@ -32,7 +32,8 @@ limitations under the License.
      android:layout_height="wrap_content"
      android:layout_marginLeft="6dip"
      android:layout_marginTop="6dip"
-      android:src="@drawable/ylw_pushpin"/>
+      android:src="@drawable/ylw_pushpin"
      android:contentDescription="@string/marker_list_icon_description"/>
    <LinearLayout
      android:orientation="vertical"
@@ -45,7 +46,6 @@ limitations under the License.
        android:layout_marginLeft="6dip"
        android:layout_marginTop="6dip"
        android:singleLine = "true"
        android:text="Name"
        android:textAppearance="?android:attr/textAppearanceLarge"/>
      <TextView android:id="@+id/waypointslist_item_time"
@@ -54,7 +54,6 @@ limitations under the License.
        android:layout_marginLeft = "6dip"
        android:singleLine = "true"
        android:textColor = "#fff"
        android:text="date and time"
        android:textAppearance="?android:attr/textAppearanceSmall"/>
      <TextView android:id="@+id/waypointslist_item_category"
@@ -63,7 +62,6 @@ limitations under the License.
        android:layout_marginLeft = "6dip"
        android:singleLine = "true"
        android:textColor="#0f0"
        android:text="category"
        android:textAppearance="?android:attr/textAppearanceSmall" />
    </LinearLayout>
  </LinearLayout>
@@ -1,138 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright 2010 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.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_height="fill_parent"
  android:layout_width="fill_parent"
  android:orientation="vertical">
  <LinearLayout
    android:background="@drawable/list_bar"
    android:layout_height="wrap_content"
    android:layout_width="fill_parent">
    <TextView
      android:layout_height="wrap_content"
      android:layout_marginLeft="10dip"
      android:layout_width="fill_parent"
      android:text="@string/send_google_title"
      android:textColor="#fff"
      android:textSize="20dip"/>
  </LinearLayout>
  <ScrollView
    android:layout_height="0dip"
    android:layout_marginBottom="5dip"
    android:layout_marginLeft="5dip"
    android:layout_marginTop="5dip"
    android:layout_weight="1"
    android:layout_width="fill_parent">
    <TableLayout
      android:layout_height="wrap_content"
      android:layout_width="fill_parent"
      android:stretchColumns="1">
      <!-- Google My Maps -->
      <TableRow>
        <ImageView
          android:layout_height="wrap_content"
          android:layout_width="wrap_content"
          android:src="@drawable/mymaps_icon"/>
        <LinearLayout
          android:layout_height="wrap_content"
          android:layout_marginLeft="10dip"
          android:layout_width="fill_parent"
          android:orientation="vertical">
          <CheckBox
            android:checked="true"
            android:id="@+id/send_google_my_maps"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:text="@string/send_google_my_maps"
            android:textSize="18dip"/>
          <RadioGroup
            android:id="@+id/send_google_my_maps_group"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent">
            <RadioButton
              android:id="@+id/send_google_new_map"
              android:layout_height="wrap_content"
              android:layout_width="fill_parent"
              android:text="@string/send_google_new_map"/>
            <RadioButton
              android:id="@+id/send_google_existing_map"
              android:layout_height="wrap_content"
              android:layout_width="fill_parent"
              android:text="@string/send_google_existing_map"/>
          </RadioGroup>
        </LinearLayout>
      </TableRow>
      <!-- Google Fusion Tables -->
      <TableRow>
        <ImageView
          android:layout_height="wrap_content"
          android:layout_width="wrap_content"
          android:src="@drawable/googledocs_icon"/>
        <LinearLayout
          android:layout_height="wrap_content"
          android:layout_marginLeft="10dip"
          android:layout_width="fill_parent"
          android:orientation="vertical">
          <CheckBox
            android:checked="true"
            android:id="@+id/send_google_fusion_tables"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:text="@string/send_google_fusion_tables"
            android:textSize="18dip"/>
        </LinearLayout>
      </TableRow>
      <!-- Google Docs -->
      <TableRow android:id="@+id/send_google_docs_table_row">
        <ImageView
          android:layout_height="wrap_content"
          android:layout_width="wrap_content"
          android:src="@drawable/googledocs_icon"/>
        <LinearLayout
          android:layout_height="wrap_content"
          android:layout_marginLeft="10dip"
          android:layout_width="fill_parent"
          android:orientation="vertical">
          <CheckBox
            android:checked="true"
            android:id="@+id/send_google_docs"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:text="@string/send_google_docs"
            android:textSize="18dip"/>
        </LinearLayout>
      </TableRow>
    </TableLayout>
  </ScrollView>
  <LinearLayout style="@style/ButtonLayout">
    <LinearLayout style="@style/ButtonSpacer"/>
    <Button
      android:id="@+id/send_google_send_now"
      android:layout_gravity="left"
      android:text="@string/send_google_send_now"
      style="@style/Button"/>
    <Button
      android:id="@+id/send_google_cancel"
      android:layout_gravity="right"
      android:text="@string/generic_cancel"
      style="@style/Button"/>
    <LinearLayout style="@style/ButtonSpacer"/>
  </LinearLayout>
 </LinearLayout>
@@ -28,7 +28,7 @@ limitations under the License.
    <LinearLayout
      android:layout_width="fill_parent"
-      android:layout_height="fill_parent"
+      android:layout_height="wrap_content"
      android:orientation="vertical">
      <TextView android:text="@string/marker_detail_marker_name"
        android:layout_width="fill_parent"
@@ -0,0 +1,34 @@
 <?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.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apl/res/com.google.android.apps.mytracks"
  android:orientation="vertical"
  android:layout_width="fill_parent"
  android:layout_height="fill_parent">
  <ListView android:id="@android:id/list"
    android:layout_height="fill_parent"
    android:layout_width="fill_parent" />
  <TextView android:id="@android:id/empty"
    android:gravity="center"
    android:layout_height="fill_parent"
    android:layout_width="fill_parent"
    android:text="@string/search_no_results"
    android:textColor="@android:color/white"
    android:textSize="20dip"
    android:textStyle="bold"
    android:visibility="gone" />
 </LinearLayout>
@@ -1,65 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright 2011 Google Inc.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
     http://www.apache.org/licenses/LICENSE-2.0
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <!--
 This layout is used as the content view for the send-to-Google result dialog.
 It is used to summarize the results of uploading track data to one or more
 services.
 -->
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
    android:paddingTop="5dip"
    android:paddingBottom="5dip"
    android:paddingLeft="14dip"
    android:paddingRight="14dip"
    android:orientation="vertical">
  <TextView
      android:layout_width="fill_parent"
      android:layout_height="wrap_content"
      android:text="@string/send_google_result_header"
      style="?android:attr/textAppearanceLarge"/>
  <TableLayout
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:gravity="center_horizontal">
    <!-- We don't want a divider, so we set its color to transparent. -->
    <!-- We do this explicitly, rather than with a color resource, because -->
    <!-- an apparent bug causes the divider to be wildly misrendered on -->
    <!-- a Mini X10 running 2.1. -->
    <ListView
        android:id="@+id/send_to_google_result_list"
        android:clickable="false"
        android:paddingTop="10dip"
        android:paddingBottom="10dip"
        android:divider="#00000000"/>
  </TableLayout>
  <TextView
      android:id="@+id/send_to_google_result_comment"
      android:layout_width="fill_parent"
      android:layout_height="wrap_content"
      android:text="@string/send_google_success_footer"
      android:visibility="gone"
      style="?android:attr/textAppearanceSmall"/>
  <TextView
      android:id="@+id/send_to_google_result_error"
      android:layout_width="fill_parent"
      android:layout_height="wrap_content"
      android:text="@string/send_google_error"
      android:visibility="gone"
      style="?android:attr/textAppearanceLarge"/>
 </LinearLayout>
@@ -1,49 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright 2011 Google Inc.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
     http://www.apache.org/licenses/LICENSE-2.0
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <!--
 This layout represents the result of sending track data to a single service.
 It will be instantiated by a custom ListAdapter - once for each service to
 which track data was uploaded.
 -->
 <TableRow
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content">
  <ImageView
      android:id="@+id/send_to_google_result_icon"
      android:src="@drawable/success"
      android:layout_width="wrap_content"
      android:layout_height="fill_parent"
      android:layout_gravity="top"/>
  <LinearLayout
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:orientation="vertical">
    <TextView
        android:id="@+id/send_to_google_result_name"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="Google Docs"
        style="?android:attr/textAppearanceMedium"/>
    <TextView
        android:id="@+id/send_to_google_result_url"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="http://google.com"
        style="?android:attr/textAppearanceSmall"/>
  </LinearLayout>
 </TableRow>
@@ -0,0 +1,143 @@
 <?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.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_height="wrap_content"
  android:layout_width="fill_parent"
  android:orientation="vertical">
  <ScrollView
    android:layout_height="0dp"
    android:layout_margin="5dp"
    android:layout_weight="1"
    android:layout_width="fill_parent">
    <LinearLayout
      android:layout_height="wrap_content"
      android:layout_width="fill_parent"
      android:orientation="vertical">
      <!-- Header -->
      <TextView
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"
        android:text="@string/send_google_result_header"
        style="?android:attr/textAppearanceLarge"/>
      <!-- Google Maps result -->
      <LinearLayout
        android:id="@+id/upload_result_maps_result"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:orientation="horizontal">
        <ImageView
          android:id="@+id/upload_result_maps_result_icon"
          android:layout_gravity="center_vertical"
          android:layout_height="wrap_content"
          android:layout_width="wrap_content"
          android:src="@drawable/success"/>
        <LinearLayout
          android:layout_height="wrap_content"
          android:layout_width="fill_parent"
          android:orientation="vertical">
          <TextView
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            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"
            style="?android:attr/textAppearanceSmall"/>
        </LinearLayout>
      </LinearLayout>
      <!-- Google Fusion Tables result -->
      <LinearLayout
        android:id="@+id/upload_result_fusion_tables_result"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:orientation="horizontal">
        <ImageView
          android:id="@+id/upload_result_fusion_tables_result_icon"
          android:layout_gravity="center_vertical"
          android:layout_height="wrap_content"
          android:layout_width="wrap_content"
          android:src="@drawable/success"/>
        <LinearLayout
          android:layout_height="wrap_content"
          android:layout_width="fill_parent"
          android:orientation="vertical">
          <TextView
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            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"
            style="?android:attr/textAppearanceSmall"/>
        </LinearLayout>
      </LinearLayout>
      <!-- Google Docs result -->
      <LinearLayout
        android:id="@+id/upload_result_docs_result"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:orientation="horizontal">
        <ImageView
          android:id="@+id/upload_result_docs_result_icon"
          android:layout_gravity="center_vertical"
          android:layout_height="wrap_content"
          android:layout_width="wrap_content"
          android:src="@drawable/success"/>
        <LinearLayout
          android:layout_height="wrap_content"
          android:layout_width="fill_parent"
          android:orientation="vertical">
          <TextView
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            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"
            style="?android:attr/textAppearanceSmall"/>
        </LinearLayout>
      </LinearLayout>
      <!-- Footer -->
      <TextView
        android:id="@+id/upload_result_success_footer"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:text="@string/send_google_success_footer"
        style="?android:attr/textAppearanceSmall"/>
      <TextView
        android:id="@+id/upload_result_error_footer"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:text="@string/send_google_error"
        style="?android:attr/textAppearanceLarge"/>
    </LinearLayout>
  </ScrollView>
 </LinearLayout>
@@ -0,0 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright 2010 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.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_height="fill_parent"
  android:layout_width="fill_parent"
  android:orientation="vertical">
  <TextView
    android:background="@drawable/list_bar"
    android:layout_height="wrap_content"
    android:layout_width="fill_parent"
    android:paddingLeft="10dp"
    android:text="@string/send_google_title"
    android:textColor="@color/white"
    android:textSize="20sp"/>
  <ScrollView
    android:layout_height="0dp"
    android:layout_margin="5dp"
    android:layout_weight="1"
    android:layout_width="fill_parent">
    <TableLayout
      android:layout_height="wrap_content"
      android:layout_width="fill_parent"
      android:stretchColumns="1">
      <!-- Google Maps -->
      <TableRow android:id="@+id/send_google_maps_row">
        <ImageView
          android:src="@drawable/maps_icon"
          style="@style/SendGoogleImageView"/>
        <CheckBox
          android:id="@+id/send_google_maps"
          android:text="@string/send_google_maps"
          style="@style/SendGoogleCheckBox"/>
      </TableRow>
      <TableRow android:id="@+id/send_google_maps_option_row">
        <RadioGroup
          android:layout_column="1"
          android:layout_height="wrap_content"
          android:layout_marginLeft="10dp"
          android:layout_width="0dp">
          <RadioButton
            android:id="@+id/send_google_new_map"
            android:text="@string/send_google_new_map"
            style="@style/SendGoogleRadioButton"/>
          <RadioButton
            android:id="@+id/send_google_existing_map"
            android:text="@string/send_google_existing_map"
            style="@style/SendGoogleRadioButton"/>
        </RadioGroup>
      </TableRow>
      <!-- Google Fusion Tables -->
      <TableRow android:id="@+id/send_google_fusion_tables_row">
        <ImageView
          android:src="@drawable/googledocs_icon"
          style="@style/SendGoogleImageView"/>
        <CheckBox
          android:id="@+id/send_google_fusion_tables"
          android:text="@string/send_google_fusion_tables"
          style="@style/SendGoogleCheckBox"/>
      </TableRow>
      <!-- Google Docs -->
      <TableRow android:id="@+id/send_google_docs_row">
        <ImageView
          android:src="@drawable/googledocs_icon"
          style="@style/SendGoogleImageView"/>
        <CheckBox
          android:id="@+id/send_google_docs"
          android:text="@string/send_google_docs"
          style="@style/SendGoogleCheckBox"/>
      </TableRow>
    </TableLayout>
  </ScrollView>
  <LinearLayout style="@style/ButtonLayout">
    <LinearLayout style="@style/ButtonSpacer"/>
    <Button
      android:id="@+id/send_google_send_now"
      android:layout_gravity="left"
      android:text="@string/send_google_send_now"
      style="@style/Button"/>
    <Button
      android:id="@+id/send_google_cancel"
      android:layout_gravity="right"
      android:text="@string/generic_cancel"
      style="@style/Button"/>
    <LinearLayout style="@style/ButtonSpacer"/>
  </LinearLayout>
 </LinearLayout>
@@ -130,10 +130,10 @@ limitations under the License.
        android:text="@string/welcome_delete_all_answer"
        style="@style/WelcomeTextView"/>     
      <TextView
-        android:text="@string/welcome_my_maps_sharing_question"
+        android:text="@string/welcome_maps_sharing_question"
        style="@style/WelcomeTextView.Question"/>
      <TextView
-        android:text="@string/welcome_my_maps_sharing_answer"
+        android:text="@string/welcome_maps_sharing_answer"
        style="@style/WelcomeTextView"/>    
    </LinearLayout>
  </ScrollView>
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright 2011 Google Inc.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
     http://www.apache.org/licenses/LICENSE-2.0
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the 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"
    android:icon="@drawable/ic_menu_recordtrack"
@@ -16,20 +31,24 @@
    android:icon="@drawable/ic_menu_waypoints"
    android:title="@string/menu_markers"/>
  <item android:id="@+id/menu_search"
    android:icon="@android:drawable/ic_menu_search"
    android:title="@string/menu_search"/>
  <item android:id="@+id/menu_sensor_state"
    android:icon="@drawable/ic_menu_sensorstatus"
    android:orderInCategory="1000"
    android:title="@string/menu_sensor_state"/>
-  
+
  <item android:id="@+id/menu_settings"
    android:icon="@android:drawable/ic_menu_preferences"
    android:orderInCategory="1001"
    android:title="@string/menu_settings"/>
-    
+
  <item android:id="@+id/menu_aggregated_statistics"
    android:orderInCategory="1002"
    android:title="@string/menu_aggregated_statistics"/>
-    
+
  <item android:id="@+id/menu_help"
    android:icon="@android:drawable/ic_menu_info_details"
    android:orderInCategory="1003"
@@ -0,0 +1,23 @@
 <?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.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
  <item android:id="@+id/menu_search"
    android:icon="@android:drawable/ic_menu_search"
    android:title="@string/menu_search"
    android:onClick="onSearch"
    android:showAsAction="always" />
 </menu>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jimmy Shih	4b229decb6	Update privacy url	2012-03-16 17:34:08 -07:00
Jimmy Shih	fcbfe9ca1c	Fix unit tests breakage.	2012-03-14 16:52:25 -07:00
Jimmy Shih	9dca626560	Update strings for release 1.1.16.	2012-03-14 15:45:12 -07:00
Jimmy Shih	8e62ff239c	fix eclipse warnings	2012-03-14 15:37:22 -07:00
Jimmy Shih	3ab54c7d67	merge heads	2012-03-14 15:17:55 -07:00
Jimmy Shih	ead6249580	Update AndroidManifest for the next release. 1.1.16	2012-03-14 15:16:32 -07:00
Jimmy Shih	17c62b3996	After saving a file to the SD card, always show the result dialog. After the user dismisses the result dialog, play or share the saved file if applicable.	2012-03-14 14:57:51 -07:00
Jimmy Shih	f3112c3acb	Fix eclipse warnings	2012-03-13 11:00:00 -07:00