Code cleanup: DeleteTest.java

Code cleanup: SettingsTest.java
Code cleanup: PauseResumeTest
2014-01-31 14:36:08 -08:00 · 2014-01-31 14:12:33 -08:00 · 2014-01-31 12:35:41 -08:00 · 2014-01-31 10:52:21 -08:00 · 2014-01-30 16:33:37 -08:00 · 2014-01-30 16:19:13 -08:00
444 changed files with 12262 additions and 10103 deletions
@@ -7,6 +7,6 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.google.gdt.eclipse.managedapis.MANAGED_API_CONTAINER/fusiontables-v1r16lv1.12.0-beta"/>
 	<classpathentry kind="con" path="com.google.gdt.eclipse.managedapis.MANAGED_API_CONTAINER/gdata-spreadsheet-2.1"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
@@ -1,4 +1,6 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
@@ -64,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=1585
 org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field.count_dependent=1585|-1|1585
@@ -16,8 +16,8 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  android:installLocation="auto"
-  android:versionCode="70"
-  android:versionName="2.0.5"
+  android:versionCode="74"
+  android:versionName="2.0.6"
  package="com.google.android.maps.mytracks" >
  <!-- Permission to initialize services -->
  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -92,7 +92,7 @@ limitations under the License.
  <uses-permission android:name="com.google.android.maps.mytracks.permission.MAPS_RECEIVE" />
  <uses-sdk
    android:minSdkVersion="8"
-    android:targetSdkVersion="17" />
+    android:targetSdkVersion="19" />
  <!-- Required features -->
  <uses-feature
    android:glEsVersion="0x00020000"
@@ -107,6 +107,9 @@ limitations under the License.
  <uses-feature
    android:name="android.hardware.bluetooth"
    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.camera"
+    android:required="false" />
  <uses-feature
    android:name="android.hardware.faketouch"
    android:required="false" />
@@ -140,7 +143,7 @@ limitations under the License.
    android:hardwareAccelerated="true"
    android:icon="@drawable/ic_launcher_my_tracks"
    android:label="@string/my_tracks_app_name"
-    android:theme="@style/MyTracks" >
+    android:theme="@style/ThemeMyTracks" >
    <!-- For data backup -->
    <meta-data
      android:name="com.google.android.backup.api_key"
@@ -157,7 +160,7 @@ limitations under the License.
    <activity
      android:label="@string/menu_help"
      android:name="com.google.android.apps.mytracks.HelpActivity" />
-    <activity android:name="com.google.android.apps.mytracks.io.file.ImportActivity" >
+    <activity android:name="com.google.android.apps.mytracks.io.file.importer.ImportActivity" >
      <intent-filter>
        <action android:name="android.intent.action.ATTACH_DATA" />
        <action android:name="android.intent.action.VIEW" />
@@ -172,7 +175,9 @@ limitations under the License.
    </activity>
    <activity android:name="com.google.android.apps.mytracks.MarkerEditActivity" />
    <activity android:name="com.google.android.apps.mytracks.MarkerDetailActivity" />
-    <activity android:name="com.google.android.apps.mytracks.MarkerListActivity" >
+    <activity
+      android:label="@string/menu_markers"
+      android:name="com.google.android.apps.mytracks.MarkerListActivity" >
      <meta-data
        android:name="android.app.default_searchable"
        android:value="com.google.android.apps.mytracks.SearchListActivity" />
@@ -207,23 +212,18 @@ limitations under the License.
        android:name="android.app.default_searchable"
        android:value="com.google.android.apps.mytracks.SearchListActivity" />
    </activity>
-    <activity android:name="com.google.android.apps.mytracks.io.backup.BackupActivity" />
-    <activity android:name="com.google.android.apps.mytracks.io.backup.RestoreActivity" />
-    <activity android:name="com.google.android.apps.mytracks.io.backup.RestoreChooserActivity" />
    <activity android:name="com.google.android.apps.mytracks.io.drive.SendDriveActivity" />
-    <activity android:name="com.google.android.apps.mytracks.io.file.SaveActivity" />
+    <activity android:name="com.google.android.apps.mytracks.io.file.exporter.SaveActivity" />
    <activity android:name="com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesActivity" />
    <activity android:name="com.google.android.apps.mytracks.io.maps.SendMapsActivity" />
    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity" />
    <activity android:name="com.google.android.apps.mytracks.io.spreadsheets.SendSpreadsheetsActivity" />
-    <activity android:name="com.google.android.apps.mytracks.settings.BackupResetSettingsActivity" />
+    <activity android:name="com.google.android.apps.mytracks.settings.AdvancedSettingsActivity" />
    <activity android:name="com.google.android.apps.mytracks.settings.ChartSettingsActivity" />
-    <activity android:name="com.google.android.apps.mytracks.settings.GoogleSettingsActivity" />
    <activity android:name="com.google.android.apps.mytracks.settings.MapSettingsActivity" />
    <activity android:name="com.google.android.apps.mytracks.settings.RecordingSettingsActivity" />
    <activity android:name="com.google.android.apps.mytracks.settings.SensorSettingsActivity" />
    <activity android:name="com.google.android.apps.mytracks.settings.SettingsActivity" />
-    <activity android:name="com.google.android.apps.mytracks.settings.SharingSettingsActivity" />
    <activity android:name="com.google.android.apps.mytracks.settings.StatsSettingsActivity" />
    <activity
      android:label="@string/track_widget_config_title"
@@ -248,7 +248,6 @@ limitations under the License.
    <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"
@@ -280,6 +279,7 @@ limitations under the License.
    <provider
      android:authorities="com.google.android.maps.mytracks"
      android:exported="true"
+      android:grantUriPermissions="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" />
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2012 Google Inc.
+Copyright 2013 Google Inc.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,15 +14,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <Button
-    android:id="@+id/help_ok"
-    android:layout_gravity="left"
-    android:text="@string/generic_ok"
-    style="@style/BottomButton" />
-  <Button
-    android:id="@+id/help_about"
-    android:layout_gravity="right"
-    android:text="@string/help_about"
-    style="@style/BottomButton" />
-</merge>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+  android:duration="1000"
+  android:fromAlpha="1.0"
+  android:interpolator="@android:anim/linear_interpolator"
+  android:toAlpha="0.0" />
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:state_window_focused="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_on_holo_dark" />
+    <item android:state_checked="false" android:state_window_focused="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_off_holo_dark" />
+          
+    <item android:state_checked="true" android:state_pressed="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_on_pressed_holo_dark" />
+    <item android:state_checked="false" android:state_pressed="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_off_pressed_holo_dark" />
+
+    <item android:state_checked="true" android:state_focused="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_on_focused_holo_dark" />
+    <item android:state_checked="false" android:state_focused="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_off_focused_holo_dark" />
+
+    <item android:state_checked="false" android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_off_holo_dark" />
+    <item android:state_checked="true" android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_on_holo_dark" />
+
+    <!-- Disabled states -->
+
+    <item android:state_checked="true" android:state_window_focused="false"
+          android:drawable="@drawable/btn_radio_on_disabled_holo_dark" />
+    <item android:state_checked="false" android:state_window_focused="false"
+          android:drawable="@drawable/btn_radio_off_disabled_holo_dark" />
+
+    <item android:state_checked="true" android:state_focused="true"
+          android:drawable="@drawable/btn_radio_on_disabled_focused_holo_dark" />
+    <item android:state_checked="false" android:state_focused="true"
+          android:drawable="@drawable/btn_radio_off_disabled_focused_holo_dark" />
+
+    <item android:state_checked="false" android:drawable="@drawable/btn_radio_off_disabled_holo_dark" />
+    <item android:state_checked="true" android:drawable="@drawable/btn_radio_on_disabled_holo_dark" />
+
+</selector>
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+          android:drawable="@drawable/spinner_disabled_holo_dark" />
+    <item android:state_pressed="true"
+          android:drawable="@drawable/spinner_pressed_holo_dark" />
+    <item android:state_pressed="false" android:state_focused="true"
+          android:drawable="@drawable/spinner_focused_holo_dark" />
+    <item android:drawable="@drawable/spinner_default_holo_dark" />
+</selector>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+  <gradient
+    android:angle="90"
+    android:centerColor="@color/text_gradient_center"
+    android:endColor="@color/text_gradient_start"
+    android:startColor="@color/text_gradient_end" />
+</shape>
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2013 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.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+  <!-- Distance, calorie, total time, and moving time -->
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
+    <include
+      android:id="@+id/stats_distance"
+      layout="@layout/stats_large_item" />
+    <include
+      android:id="@+id/stats_calorie"
+      layout="@layout/stats_calorie" />
+    <View
+      android:layout_height="match_parent"
+      android:layout_width="1dp"
+      android:visibility="invisible" />
+    <include
+      android:id="@+id/stats_total_time"
+      layout="@layout/stats_large_item" />
+    <include
+      android:id="@+id/stats_moving_time"
+      layout="@layout/stats_large_item" />
+  </LinearLayout>
+  <!-- Horizontal line -->
+  <View style="@style/StatsHorizontalLine" />
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
+    <TableLayout
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:layout_width="0dp" >
+      <!-- Speed and average speed -->
+      <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent" >
+        <include
+          android:id="@+id/stats_speed"
+          layout="@layout/stats_small_item" />
+        <include
+          android:id="@+id/stats_average_speed"
+          layout="@layout/stats_small_item" />
+      </LinearLayout>
+      <!-- Max speed and average moving speed -->
+      <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent" >
+        <include
+          android:id="@+id/stats_max_speed"
+          layout="@layout/stats_small_item" />
+        <include
+          android:id="@+id/stats_average_moving_speed"
+          layout="@layout/stats_small_item" />
+      </LinearLayout>
+      <!-- Latitude and longitude -->
+      <LinearLayout
+        android:id="@+id/stats_coordinate_container"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent" >
+        <include
+          android:id="@+id/stats_latitude"
+          layout="@layout/stats_small_item" />
+        <include
+          android:id="@+id/stats_longitude"
+          layout="@layout/stats_small_item" />
+      </LinearLayout>
+    </TableLayout>
+    <!-- Vertical line -->
+    <View
+      android:background="@color/stats_separator"
+      android:id="@+id/stats_grade_elevation_separator"
+      android:layout_height="match_parent"
+      android:layout_width="1dp" />
+    <LinearLayout
+      android:id="@+id/stats_grade_elevation_container"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:layout_width="0dp" >
+      <!-- Grade -->
+      <LinearLayout style="@style/StatsSmallGroupContainer" >
+        <!-- Grade label -->
+        <TextView
+          android:text="@string/stats_grade"
+          style="@style/StatsSmallLabel" />
+        <TableLayout
+          android:layout_gravity="center"
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content" >
+          <!-- Grade min -->
+          <include
+            android:id="@+id/stats_grade_min"
+            layout="@layout/stats_small_group_item" />
+          <!-- Grade max -->
+          <include
+            android:id="@+id/stats_grade_max"
+            layout="@layout/stats_small_group_item" />
+        </TableLayout>
+      </LinearLayout>
+      <!-- Elevation -->
+      <LinearLayout style="@style/StatsSmallGroupContainer" >
+        <!-- Elevation label -->
+        <TextView
+          android:text="@string/stats_elevation"
+          style="@style/StatsSmallLabel" />
+        <TableLayout
+          android:layout_gravity="center"
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content" >
+          <!-- Elevation -->
+          <include
+            android:id="@+id/stats_elevation"
+            layout="@layout/stats_small_group_item" />
+          <!-- Elevation gain -->
+          <include
+            android:id="@+id/stats_elevation_gain"
+            layout="@layout/stats_small_group_item" />
+          <!-- Elevation min -->
+          <include
+            android:id="@+id/stats_elevation_min"
+            layout="@layout/stats_small_group_item" />
+          <!-- Elevation max -->
+          <include
+            android:id="@+id/stats_elevation_max"
+            layout="@layout/stats_small_group_item" />
+        </TableLayout>
+      </LinearLayout>
+    </LinearLayout>
+  </LinearLayout>
+</merge>
@@ -29,7 +29,7 @@ limitations under the License.
      android:layout_width="match_parent" />
    <ImageButton
      android:background="@android:color/transparent"
-      android:contentDescription="@string/icon_record_track"
+      android:contentDescription="@string/image_record"
      android:id="@+id/track_controller_record"
      android:layout_height="0dp"
      android:layout_weight="10"
@@ -56,7 +56,7 @@ limitations under the License.
    </RelativeLayout>
    <ImageButton
      android:background="@android:color/transparent"
-      android:contentDescription="@string/icon_stop_recording"
+      android:contentDescription="@string/image_stop"
      android:id="@+id/track_controller_stop"
      android:layout_height="0dp"
      android:layout_weight="10"
@@ -17,8 +17,7 @@ limitations under the License.
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:baselineAligned="false"
  android:layout_height="match_parent"
-  android:layout_width="match_parent"
-  android:orientation="horizontal" >
+  android:layout_width="match_parent" >
  <include layout="@layout/track_controller" />
  <TabHost
    android:id="@android:id/tabhost"
@@ -15,21 +15,69 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:baselineAligned="false"
  android:layout_height="match_parent"
-  android:layout_width="match_parent"
-  android:orientation="horizontal" >
+  android:layout_width="match_parent" >
  <include layout="@layout/track_controller" />
  <ListView
    android:id="@+id/track_list"
    android:layout_height="match_parent"
    android:layout_weight="1.0"
    android:layout_width="0dp" />
-  <TextView
+  <RelativeLayout
    android:id="@+id/track_list_empty_view"
    android:layout_height="match_parent"
    android:layout_weight="1.0"
-    android:layout_width="0dp"
-    android:text="@string/track_list_empty_message"
-    style="@style/ListEmptyTextView" >
-  </TextView>
+    android:layout_width="0dp" >
+    <LinearLayout
+      android:id="@+id/track_list_arrow_long"
+      android:layout_alignParentLeft="true"
+      android:layout_height="match_parent"
+      android:layout_width="wrap_content"
+      android:orientation="vertical"
+      android:paddingLeft="12dp"
+      android:paddingRight="16dp" >
+      <View
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_width="match_parent" />
+      <ImageView
+        android:contentDescription="@string/image_arrow"
+        android:layout_height="0dp"
+        android:layout_weight="10"
+        android:layout_width="wrap_content"
+        android:src="@drawable/ic_arrow_long" />
+      <View
+        android:layout_height="0dp"
+        android:layout_weight="17"
+        android:layout_width="match_parent" />
+    </LinearLayout>
+    <LinearLayout
+      android:layout_height="match_parent"
+      android:layout_toRightOf="@id/track_list_arrow_long"
+      android:layout_width="match_parent"
+      android:orientation="vertical" >
+      <View
+        android:layout_height="0dp"
+        android:layout_weight="4"
+        android:layout_width="match_parent" />
+      <LinearLayout
+        android:layout_height="0dp"
+        android:layout_weight="24"
+        android:layout_width="match_parent" >
+        <TextView
+          android:layout_height="wrap_content"
+          android:layout_weight=".7"
+          android:layout_width="0dp"
+          android:text="@string/track_list_empty_message"
+          android:textColor="@color/list_empty_text"
+          style="@style/TextLarge" >
+        </TextView>
+        <View
+          android:layout_height="match_parent"
+          android:layout_weight=".3"
+          android:layout_width="0dp" />
+      </LinearLayout>
+    </LinearLayout>
+  </RelativeLayout>
 </LinearLayout>
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2008 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.
-->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/ScrollView" >
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:padding="8dp" >
-    <TextView
-      android:drawableLeft="@drawable/ic_launcher_my_tracks"
-      android:text="@string/about_copyright_notice"
-      style="@style/TextMedium.WithIcon" />
-    <TextView
-      android:text="@string/about_version"
-      style="@style/TextLarge" />
-    <TextView
-      android:id="@+id/about_version"
-      style="@style/AboutValue" />
-    <TextView
-      android:text="@string/about_support"
-      style="@style/TextLarge" />
-    <TextView
-      android:autoLink="web"
-      android:text="@string/my_tracks_support_url"
-      style="@style/AboutValue" />
-    <TextView
-      android:text="@string/about_privacy"
-      style="@style/TextLarge" />
-    <TextView
-      android:autoLink="web"
-      android:text="@string/my_tracks_privacy_url"
-      style="@style/AboutValue" />
-  </LinearLayout>
-</ScrollView>
@@ -14,14 +14,12 @@ 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.
 -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:title="@string/settings_google" >
-  <ListPreference
-    android:defaultValue=""
-    android:key="@string/google_account_key"
-    android:title="@string/settings_google_account_title" />
-  <CheckBoxPreference
-    android:defaultValue="false"
-    android:key="@string/drive_sync_key"
-    android:title="@string/menu_sync_drive" />
-</PreferenceScreen>
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:ellipsize="marquee"
+  android:gravity="center_vertical"
+  android:id="@android:id/text1"
+  android:layout_height="48dp"
+  android:layout_width="match_parent"
+  android:padding="8dp"
+  android:singleLine="true"
+  style="@style/TextSmall" />
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2012 Google Inc.
+Copyright 2013 Google Inc.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,16 +14,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <!-- In v14, postive button on the right. -->
-  <Button
-    android:id="@+id/help_about"
-    android:layout_gravity="left"
-    android:text="@string/help_about"
-    style="@style/BottomButton" />
-  <Button
-    android:id="@+id/help_ok"
-    android:layout_gravity="right"
-    android:text="@string/generic_ok"
-    style="@style/BottomButton" />
-</merge>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:ellipsize="marquee"
+  android:id="@android:id/text1"
+  android:layout_height="wrap_content"
+  android:layout_width="match_parent"
+  android:paddingLeft="8dp"
+  android:singleLine="true"
+  style="@style/TextSmall" />
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2012 Google Inc.
+Copyright 2013 Google Inc.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,21 +19,20 @@ limitations under the License.
  <LinearLayout
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="12dp"
-    android:paddingLeft="14dp"
-    android:paddingRight="10dp"
-    android:paddingTop="2dp" >
-    <TextView
-      android:autoLink="web"
-      android:id="@+id/confirm_dialog_message"
-      style="@style/TextMedium" />
-    <CheckBox
-      android:id="@+id/confirm_dialog_check_box"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:paddingTop="16dp" >
+    <AutoCompleteTextView
+      android:hint="@string/track_edit_activity_type_hint"
+      android:id="@+id/activity_type_preference_text_view"
+      android:layout_height="match_parent"
+      android:layout_weight="1"
+      android:layout_width="0dp"
+      style="@style/EditCategory" />
+    <Spinner
+      android:id="@+id/activity_type_preference_spinner"
+      android:layout_gravity="bottom"
      android:layout_height="wrap_content"
-      android:layout_marginTop="8dp"
-      android:layout_width="match_parent"
-      android:text="@string/generic_do_not_show_again"
-      style="@style/TextMedium" />
+      android:layout_width="wrap_content" />
  </LinearLayout>
 </ScrollView>
@@ -19,11 +19,10 @@ limitations under the License.
  android:layout_height="wrap_content"
  android:layout_width="match_parent"
  android:minHeight="?android:attr/listPreferredItemHeight"
-  android:orientation="horizontal"
  android:paddingLeft="16dp"
  android:paddingRight="16dp" >
  <ImageView
-    android:contentDescription="@string/icon_application"
+    android:contentDescription="@string/image_application"
    android:id="@+id/choose_activity_list_item_icon"
    android:layout_height="@android:dimen/app_icon_size"
    android:layout_width="@android:dimen/app_icon_size"
@@ -14,10 +14,42 @@ 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.
 -->
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_height="wrap_content"
  android:layout_width="match_parent"
-  android:numColumns="4"
-  android:padding="4dp"
-  android:stretchMode="spacingWidth"
-  android:verticalSpacing="4dp" />
+  android:orientation="vertical" >
+  <GridView
+    android:id="@+id/choose_activity_type_grid_view"
+    android:layout_height="0dp"
+    android:layout_weight="1"
+    android:layout_width="match_parent"
+    android:numColumns="4"
+    android:padding="4dp"
+    android:stretchMode="spacingWidth"
+    android:verticalSpacing="4dp" />
+  <LinearLayout
+    android:id="@+id/choose_activity_type_weight_container"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:orientation="vertical" >
+    <TextView
+      android:id="@+id/choose_activity_type_weight_label"
+      android:layout_marginBottom="2dp"
+      android:layout_marginLeft="16dp"
+      android:layout_marginRight="16dp"
+      android:layout_marginTop="4dp"
+      android:paddingLeft="12dp"
+      style="@style/TextMedium" />
+    <EditText
+      android:id="@+id/choose_activity_type_weight"
+      android:inputType="numberDecimal"
+      android:layout_marginBottom="4dp"
+      android:layout_marginLeft="16dp"
+      android:layout_marginRight="16dp"
+      android:layout_marginTop="2dp"
+      android:layout_width="match_parent"
+      android:selectAllOnFocus="true"
+      android:singleLine="true"
+      style="@style/TextMedium" />
+  </LinearLayout>
+</LinearLayout>
@@ -16,15 +16,15 @@ limitations under the License.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
  style="@style/ScrollView" >
-  <RadioGroup
-    android:id="@+id/export_type_options"
+  <LinearLayout
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
+    android:orientation="vertical"
    android:padding="8dp" >
-    <RadioButton
-      android:id="@+id/export_google_maps"
-      android:text="@string/export_google_maps"
-      style="@style/TextMedium" />
+    <Spinner
+      android:id="@+id/export_type_options"
+      android:layout_height="wrap_content"
+      android:layout_width="match_parent" />
    <RadioGroup
      android:id="@+id/export_google_maps_options"
      style="@style/ExportRadioGroup" >
@@ -37,10 +37,6 @@ limitations under the License.
        android:text="@string/export_google_maps_unlisted"
        style="@style/TextMedium" />
    </RadioGroup>
-    <RadioButton
-      android:id="@+id/export_google_fusion_tables"
-      android:text="@string/export_google_fusion_tables"
-      style="@style/TextMedium" />
    <RadioGroup
      android:id="@+id/export_google_fusion_tables_options"
      style="@style/ExportRadioGroup" >
@@ -53,14 +49,6 @@ limitations under the License.
        android:text="@string/export_google_fusion_tables_private"
        style="@style/TextMedium" />
    </RadioGroup>
-    <RadioButton
-      android:id="@+id/export_google_spreadsheets"
-      android:text="@string/export_google_spreadsheets"
-      style="@style/TextMedium" />
-    <RadioButton
-      android:id="@+id/export_external_storage"
-      android:text="@string/export_external_storage"
-      style="@style/TextMedium" />
    <RadioGroup
      android:id="@+id/export_external_storage_options"
      style="@style/ExportRadioGroup" >
@@ -77,5 +65,10 @@ limitations under the License.
        android:id="@+id/export_external_storage_tcx"
        style="@style/TextMedium" />
    </RadioGroup>
-  </RadioGroup>
+    <Spinner
+      android:id="@+id/export_account"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="24dp"
+      android:layout_width="wrap_content" />
+  </LinearLayout>
 </ScrollView>
@@ -26,6 +26,13 @@ limitations under the License.
  </ScrollView>
  <View style="@style/BottomButtonDivider" />
  <LinearLayout style="@style/BottomButtonBar" >
-    <include layout="@layout/help_buttons" />
+    <Button
+      android:id="@+id/help_feedback"
+      android:layout_gravity="center"
+      android:text="@string/menu_feedback"
+      android:textAllCaps="true"
+      android:textColor="@android:color/white"
+      android:textSize="14sp"
+      style="@style/BottomButton" />
  </LinearLayout>
 </LinearLayout>
@@ -14,64 +14,121 @@ 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.
 -->
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_height="wrap_content"
-  android:layout_width="match_parent"
-  android:minHeight="?android:attr/listPreferredItemHeight"
-  android:paddingBottom="12dp"
-  android:paddingRight="12dp"
-  android:paddingTop="8dp"
-  android:shrinkColumns="1"
-  android:stretchColumns="1"
-  style="@style/ListItem" >
-  <TableRow
+  android:layout_width="match_parent" >
+  <!-- Photo -->
+  <ImageView
+    android:contentDescription="@string/image_photo_marker"
+    android:id="@+id/list_item_photo"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:layout_marginBottom="4dp"
+    android:scaleType="centerCrop" />
+  <FrameLayout
    android:layout_height="wrap_content"
    android:layout_width="match_parent" >
+    <!-- A gradient on top of the text -->
    <ImageView
-      android:contentDescription="@string/icon_track"
-      android:id="@+id/list_item_icon"
-      android:layout_gravity="center_vertical"
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="8dp"
-      android:layout_marginRight="8dp"
-      android:layout_width="wrap_content" />
+      android:alpha=".6"
+      android:contentDescription="@string/image_photo_marker"
+      android:id="@+id/list_item_text_gradient"
+      android:layout_height="match_parent"
+      android:layout_width="match_parent"
+      android:src="@drawable/text_gradient" />
+    <!-- Table 1 -->
    <TableLayout
      android:layout_height="wrap_content"
      android:layout_width="match_parent"
-      android:shrinkColumns="0"
-      android:stretchColumns="0" >
+      android:minHeight="?android:attr/listPreferredItemHeight"
+      android:paddingBottom="12dp"
+      android:paddingRight="12dp"
+      android:paddingTop="8dp"
+      android:shrinkColumns="1"
+      android:stretchColumns="1" >
+      <!-- Table 1: Row 1 -->
      <TableRow>
-        <TextView
-          android:id="@+id/list_item_name"
-          android:layout_gravity="bottom"
-          android:layout_width="fill_parent"
-          android:singleLine="true"
-          style="@style/TextMedium" />
-        <TextView
-          android:id="@+id/list_item_date"
-          style="@style/ListItemDate" />
+        <!-- Table 1: Row 1: Column 1: (icon) -->
+        <ImageView
+          android:contentDescription="@string/image_track"
+          android:id="@+id/list_item_icon"
+          android:layout_gravity="center_vertical"
+          android:layout_height="wrap_content"
+          android:layout_marginLeft="8dp"
+          android:layout_marginRight="8dp"
+          android:layout_width="wrap_content" />
+        <!-- Table 1: Row 1: Column 2: (Table 2) -->
+        <TableLayout
+          android:layout_height="wrap_content"
+          android:layout_width="match_parent"
+          android:shrinkColumns="0"
+          android:stretchColumns="0" >
+          <TableRow>
+            <!-- Table 2: Row 1: Column 1: (name) -->
+            <TextView
+              android:ellipsize="end"
+              android:id="@+id/list_item_name"
+              android:layout_gravity="bottom"
+              android:layout_width="match_parent"
+              android:singleLine="true"
+              style="@style/TextMedium" />
+            <!-- Table 2: Row 1: Column 2: (date) -->
+            <TextView
+              android:id="@+id/list_item_date"
+              style="@style/ListItemDate" />
+          </TableRow>
+          <TableRow>
+            <!-- Need to match the style set in ListItemUtils.setListItem -->
+            <!-- Table 2: Row 2: Column 1: (shared owner, total time, total distance, and marker count) -->
+            <LinearLayout
+              android:layout_gravity="bottom"
+              android:layout_height="wrap_content"
+              android:layout_width="match_parent" >
+              <TextView
+                android:ellipsize="end"
+                android:id="@+id/list_item_owner_time_distance"
+                android:layout_gravity="bottom"
+                android:singleLine="true"
+                style="@style/TextSmall" />
+              <ImageView
+                android:contentDescription="@string/image_marker_count"
+                android:id="@+id/list_item_marker_count_icon"
+                android:layout_gravity="bottom"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="1dp"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_width="wrap_content"
+                android:scaleType="centerInside"
+                android:src="@drawable/ic_menu_insert_marker" />
+              <TextView
+                android:ellipsize="end"
+                android:id="@+id/list_item_marker_count"
+                android:layout_gravity="bottom"
+                android:singleLine="true"
+                style="@style/TextSmall" />
+            </LinearLayout>
+            <!-- Table 2: Row 2: Column 2: (time) -->
+            <TextView
+              android:id="@+id/list_item_time"
+              style="@style/ListItemDate" />
+          </TableRow>
+        </TableLayout>
      </TableRow>
      <TableRow>
-        <!-- Need to match the style set in ListItemUtils.setListItem -->
+        <!-- Table 1: Row 2: (category and description) -->
        <TextView
-          android:id="@+id/list_item_time_distance"
-          android:layout_gravity="bottom"
-          android:layout_width="fill_parent"
-          android:singleLine="true"
+          android:ellipsize="end"
+          android:id="@+id/list_item_category_description"
+          android:layout_column="1"
+          android:maxLines="2"
+          android:singleLine="false"
          style="@style/TextSmall" />
-        <TextView
-          android:id="@+id/list_item_time"
-          style="@style/ListItemDate" />
      </TableRow>
    </TableLayout>
-  </TableRow>
-  <TableRow
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
-    <TextView
-      android:id="@+id/list_item_description"
-      android:layout_column="1"
-      android:singleLine="false"
-      style="@style/TextSmall" />
-  </TableRow>
-</TableLayout>
+  </FrameLayout>
+  <View
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    style="@style/ListItem" />
+</FrameLayout>
@@ -19,7 +19,7 @@ limitations under the License.
  android:layout_height="match_parent"
  android:layout_width="match_parent" >
  <TextView
-    android:background="@color/warning_background"
+    android:background="@color/holo_orange_dark"
    android:drawableLeft="@drawable/ic_warning"
    android:gravity="left|center_vertical"
    android:id="@+id/map_message"
@@ -31,7 +31,7 @@ limitations under the License.
    style="@style/TextMedium.WithIcon" />
  <ImageButton
    android:background="@drawable/my_location"
-    android:contentDescription="@string/icon_my_location"
+    android:contentDescription="@string/image_my_location"
    android:id="@+id/map_my_location"
    android:layout_alignParentRight="true"
    android:layout_alignParentTop="true"
@@ -1,50 +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.
-->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/StatsScrollView" >
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:padding="8dp" >
-    <TextView
-      android:id="@+id/marker_detail_name"
-      style="@style/TextLarge" />
-    <LinearLayout
-      android:id="@+id/marker_detail_waypoint_section"
-      android:layout_height="wrap_content"
-      android:layout_width="match_parent"
-      android:orientation="vertical" >
-      <TextView
-        android:id="@+id/marker_detail_waypoint_marker_type"
-        style="@style/TextLarge.WithTopMargin" />
-      <TextView
-        android:id="@+id/marker_detail_waypoint_description"
-        style="@style/TextLarge.WithTopMargin" />
-    </LinearLayout>
-    <LinearLayout
-      android:id="@+id/marker_detail_statistics_section"
-      android:layout_height="wrap_content"
-      android:layout_width="match_parent"
-      android:orientation="vertical" >
-      <TextView
-        android:text="@string/marker_detail_statistics_title"
-        style="@style/TextLarge.WithTopMargin" />
-      <include layout="@layout/stats_content" />
-    </LinearLayout>
-  </LinearLayout>
-</ScrollView>
@@ -15,17 +15,10 @@ 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:id="@+id/stats_small_1line_id"
-  style="@style/StatsSmallValueContainer" >
-  <TextView
-    android:id="@+id/stats_value"
-    style="@style/StatsSmallValue" />
-  <TextView
-    android:id="@+id/stats_unit"
-    style="@style/StatsUnit" />
-  <TextView
-    android:id="@+id/stats_label"
-    android:layout_gravity="bottom"
-    android:paddingLeft="8dp"
-    style="@style/StatsSmallLabel" />
+  android:layout_height="match_parent"
+  android:layout_width="match_parent" >
+  <android.support.v4.view.ViewPager
+    android:id="@+id/maker_detail_activity_view_pager"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent" />
 </LinearLayout>
@@ -0,0 +1,88 @@
+<?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.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent" >
+  <FrameLayout
+    android:id="@+id/marker_detail_waypoint"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent" >
+    <ImageView
+      android:background="@android:color/black"
+      android:contentDescription="@string/image_photo_marker"
+      android:id="@+id/marker_detail_waypoint_photo"
+      android:layout_height="match_parent"
+      android:layout_width="match_parent"
+      android:scaleType="fitCenter" />
+    <FrameLayout
+      android:layout_height="wrap_content"
+      android:layout_width="match_parent" >
+      <!-- A gradient on top of the text -->
+      <ImageView
+        android:alpha=".6"
+        android:contentDescription="@string/image_photo_marker"
+        android:id="@+id/marker_detail_waypoint_text_gradient"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:src="@drawable/text_gradient" />
+      <LinearLayout
+        android:id="@+id/marker_detail_waypoint_info"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="80dp"
+        android:layout_width="match_parent"
+        android:orientation="vertical"
+        android:padding="8dp" >
+        <TextView
+          android:id="@+id/marker_detail_waypoint_name"
+          android:paddingTop="8dp"
+          style="@style/TextMedium" />
+        <TextView
+          android:id="@+id/marker_detail_waypoint_category"
+          style="@style/TextSmall" />
+        <TextView
+          android:id="@+id/marker_detail_waypoint_description"
+          style="@style/TextSmall" />
+        <TextView
+          android:id="@+id/marker_detail_waypoint_location"
+          style="@style/TextSmall" />
+      </LinearLayout>
+    </FrameLayout>
+  </FrameLayout>
+  <ScrollView
+    android:id="@+id/marker_detail_statistics"
+    style="@style/StatsScrollView" >
+    <LinearLayout
+      android:layout_height="wrap_content"
+      android:layout_width="match_parent"
+      android:orientation="vertical"
+      android:padding="8dp" >
+      <TextView
+        android:id="@+id/marker_detail_statistics_name"
+        android:paddingTop="8dp"
+        style="@style/TextMedium" />
+      <TextView
+        android:id="@+id/marker_detail_statistics_location"
+        style="@style/TextSmall" />
+      <TextView
+        android:paddingBottom="6dp"
+        android:paddingTop="4dp"
+        android:text="@string/marker_detail_statistics_title"
+        style="@style/TextSmall" />
+      <include layout="@layout/stats_content" />
+    </LinearLayout>
+  </ScrollView>
+</FrameLayout>
@@ -57,6 +57,7 @@ limitations under the License.
          android:hint="@string/marker_edit_marker_type_hint"
          android:id="@+id/marker_edit_waypoint_marker_type"
          android:imeOptions="actionNext"
+          android:layout_width="match_parent"
          style="@style/EditCategory" />
        <TextView
          android:text="@string/generic_description"
@@ -20,7 +20,7 @@ limitations under the License.
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
    android:orientation="vertical"
-    android:padding="8dp">
+    android:padding="8dp" >
    <CheckBox
      android:id="@+id/share_track_public"
      android:layout_gravity="center_vertical"
@@ -43,9 +43,11 @@ limitations under the License.
      android:singleLine="false"
      android:visibility="gone" >
    </MultiAutoCompleteTextView>
-    <TextView 
-      android:text="@string/share_track_footer"
-      android:layout_marginTop="16dp"
-      style="@style/TextSmall" />
+    <Spinner
+      android:id="@+id/share_track_account"
+      android:layout_height="wrap_content"
+      android:layout_marginLeft="8dp"
+      android:layout_marginTop="24dp"
+      android:layout_width="wrap_content" />
  </LinearLayout>
 </ScrollView>
--- a/Show More
+++ b/Show More