merge heads

MyTracks/res/layout/about.xml

@@ -14,88 +14,65 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<ScrollView
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="wrap_content"
-  android:layout_width="fill_parent">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_height="fill_parent"
+  android:layout_width="fill_parent" >
+
   <LinearLayout
     android:layout_height="wrap_content"
     android:layout_width="fill_parent"
     android:orientation="vertical"
-    android:padding="10dp">
+    android:padding="8dp" >
 
-    <!-- Title -->
-    <LinearLayout
+    <TextView
+      android:drawableLeft="@drawable/arrow_icon"
+      android:drawablePadding="8dp"
+      android:gravity="center"
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
-      android:orientation="horizontal">
-      <ImageView
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:src="@drawable/arrow_icon"/>
-      <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/my_tracks_app_name"
-          android:textSize="30sp"/>
-        <TextView
-          android:layout_height="wrap_content"
-          android:layout_width="fill_parent"
-          android:text="@string/about_copyright_notice"
-          android:textSize="16sp"/>
-      </LinearLayout>
-    </LinearLayout>
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/about_copyright_notice" />
 
-    <!-- Team -->
     <TextView
-      android:text="@string/about_team"
-      style="@style/AboutLabel"/>
-    <TextView
-      android:text="@string/about_bart"
-      style="@style/AboutItem"/>
-    <TextView
-      android:text="@string/about_dylan"
-      style="@style/AboutItem"/>
-    <TextView
-      android:text="@string/about_jimmy"
-      style="@style/AboutItem"/>
-    <TextView
-      android:text="@string/about_leif"
-      style="@style/AboutItem"/>
-    <TextView
-      android:text="@string/about_rodrigo"
-      style="@style/AboutItem"/>
-    <TextView
-      android:text="@string/about_sandor"
-      style="@style/AboutItem"/>
-  
-    <!-- Version -->
-    <TextView
-      android:text="@string/about_version"
-      style="@style/AboutLabel"/>
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Large"
+      android:text="@string/about_version" />
+
     <TextView
       android:id="@+id/about_version"
-      style="@style/AboutItem"/>
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:paddingLeft="48dp"
+      style="@android:style/TextAppearance.DeviceDefault.Medium" />
 
-    <!-- Support -->
     <TextView
-      android:text="@string/about_support"
-      style="@style/AboutLabel"/>
-    <TextView
-      android:text="@string/my_tracks_support_url"
-      style="@style/AboutUrl"/>
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Large"
+      android:text="@string/about_support" />
 
-    <!--  Privacy -->
     <TextView
-      android:text="@string/about_privacy"
-      style="@style/AboutLabel"/>
+      android:autoLink="web"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:paddingLeft="48dp"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/my_tracks_support_url" />
+
     <TextView
-      android:text="@string/my_tracks_privacy_url"
-      style="@style/AboutUrl"/>
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Large"
+      android:text="@string/about_privacy" />
+
+    <TextView
+      android:autoLink="web"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:paddingLeft="48dp"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/my_tracks_privacy_url" />
   </LinearLayout>
+
 </ScrollView>

MyTracks/res/layout/chart_settings.xml

@@ -14,106 +14,88 @@ 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"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
-  android:orientation="vertical">
-  <TableLayout
+  android:layout_width="fill_parent" >
+
+  <LinearLayout
     android:layout_height="wrap_content"
     android:layout_width="fill_parent"
-    android:shrinkColumns="0"
-    android:stretchColumns="0">
-    <TableRow>
-      <TextView
-        android:background="@drawable/list_bar"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        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">
-    <LinearLayout 
+    android:orientation="vertical"
+    android:padding="8dp" >
+
+    <TextView
+      android:drawableLeft="@drawable/x_axis"
+      android:drawablePadding="8dp"
+      android:gravity="bottom"
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
-      android:orientation="vertical"
-      android:padding="10dp">
-      
-      <!-- X axis -->
-      <LinearLayout style="@style/ChartSettingsAxisLayout">
-        <ImageView
-          android:src="@drawable/x_axis"
-          style="@style/ChartSettingsAxisImage"/>
-        <TextView
-          android:text="@string/chart_settings_x_axis"
-          style="@style/ChartSettingsAxisText"/>
-      </LinearLayout>
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Large"
+      android:text="@string/chart_settings_x_axis" />
 
-      <RadioGroup
-        android:id="@+id/chart_settings_x"
+    <RadioGroup
+      android:id="@+id/chart_settings_x"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content" >
+
+      <RadioButton
+        android:id="@+id/chart_settings_by_distance"
         android:layout_height="wrap_content"
-        android:layout_width="fill_parent">
-        <RadioButton
-          android:id="@+id/chart_settings_by_distance"
-          android:text="@string/chart_settings_by_distance"
-          style="@style/ChartSettingsRadioButton"/>
-        <RadioButton
-          android:id="@+id/chart_settings_by_time"
-          android:text="@string/chart_settings_by_time"
-          style="@style/ChartSettingsRadioButton"/>
-      </RadioGroup>
+        android:layout_width="wrap_content"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/chart_settings_by_distance" />
 
-      <!-- Y axis -->
-      <LinearLayout
-        android:paddingTop="10dp"
-        style="@style/ChartSettingsAxisLayout">
-        <ImageView
-          android:src="@drawable/y_axis"
-          style="@style/ChartSettingsAxisImage"/>
-        <TextView
-          android:text="@string/chart_settings_y_axis"
-          style="@style/ChartSettingsAxisText"/>
-      </LinearLayout>
+      <RadioButton
+        android:id="@+id/chart_settings_by_time"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/chart_settings_by_time" />
+    </RadioGroup>
 
-      <CheckBox
-        android:id="@+id/chart_settings_elevation"
-        android:text="@string/stat_elevation"
-        style="@style/ChartSettingsCheckbox"/>
-      <CheckBox
-        android:id="@+id/chart_settings_speed"
-        android:text="@string/stat_speed"
-        style="@style/ChartSettingsCheckbox"/>
-      <CheckBox
-        android:id="@+id/chart_settings_power"
-        android:text="@string/sensor_state_power"
-        style="@style/ChartSettingsCheckbox"/>
-      <CheckBox
-        android:id="@+id/chart_settings_cadence"
-        android:text="@string/sensor_state_cadence"
-        style="@style/ChartSettingsCheckbox"/>
-      <CheckBox
-        android:id="@+id/chart_settings_heart_rate"
-        android:text="@string/sensor_state_heart_rate"
-        style="@style/ChartSettingsCheckbox"/>
-    </LinearLayout>
-  </ScrollView>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button
-      android:id="@+id/chart_settings_ok"
-      android:layout_gravity="left"
-      android:text="@string/generic_ok"
-      style="@style/Button"/>
-    <Button
-      android:id="@+id/chart_settings_cancel"
-      android:layout_gravity="right"
-      android:text="@string/generic_cancel"
-      style="@style/Button"/>
-    <LinearLayout style="@style/ButtonSpacer"/>
+    <TextView
+      android:drawableLeft="@drawable/y_axis"
+      android:drawablePadding="8dp"
+      android:gravity="bottom"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Large"
+      android:text="@string/chart_settings_y_axis" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_elevation"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/stat_elevation" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_speed"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/stat_speed" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_power"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/sensor_state_power" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_cadence"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/sensor_state_cadence" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_heart_rate"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/sensor_state_heart_rate" />
   </LinearLayout>
-</LinearLayout>
+
+</ScrollView>

MyTracks/res/layout/mytracks_charts.xml

@@ -23,15 +23,13 @@ limitations under the License.
   <LinearLayout android:id="@+id/elevation_chart"
     android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_weight="1">
+    android:layout_height="fill_parent">
   </LinearLayout>
   <RelativeLayout android:id="@+id/elevation_zoom_layout"
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:padding="10dip"
-    android:layout_weight="0">
+    android:padding="10dp">
     <ZoomControls android:id="@+id/elevation_zoom"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -44,17 +42,16 @@ limitations under the License.
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:layout_weight="0"
-    android:padding="3dip"
+    android:padding="3dp"
     android:visibility="gone">
     <ProgressBar
       android:layout_weight="1"
-      android:layout_height="0dip"
+      android:layout_height="0dp"
       android:layout_width="wrap_content"
-      android:maxWidth="80dip"
-      android:maxHeight="80dip"
-      android:minWidth="80dip"
-      android:minHeight="80dip"
+      android:maxWidth="80dp"
+      android:maxHeight="80dp"
+      android:minWidth="80dp"
+      android:minHeight="80dp"
       android:layout_gravity="center"/>
   </LinearLayout>
 </RelativeLayout>

MyTracks/res/layout/mytracks_layout.xml

@@ -33,51 +33,30 @@ limitations under the License.
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/list_bar"
-    android:layout_weight="0"
-    android:padding="3dip"
+    android:padding="3dp"
     android:visibility="gone">
     <TextView android:id="@+id/messagetext"
-      android:layout_width="fill_parent"
+      android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:textSize="16dip"
+      android:textSize="16dp"
       android:textColor="#fff"
       android:text="@string/gps_wait_for_fix"
-      android:layout_weight="0"/>
+      android:layout_weight="1"/>
     </LinearLayout>
     <LinearLayout android:id="@+id/busypane"
       android:orientation="vertical"
       android:layout_width="fill_parent"
       android:layout_height="fill_parent"
-      android:layout_weight="0"
-      android:padding="3dip"
+      android:padding="3dp"
       android:visibility="gone">
       <ProgressBar
         android:layout_weight="1"
-        android:layout_height="0dip"
+        android:layout_height="0dp"
         android:layout_width="wrap_content"
-        android:maxWidth="80dip"
-        android:maxHeight="80dip"
-        android:minWidth="80dip"
-        android:minHeight="80dip"
+        android:maxWidth="80dp"
+        android:maxHeight="80dp"
+        android:minWidth="80dp"
+        android:minHeight="80dp"
         android:layout_gravity="center"/>
     </LinearLayout>
-    <LinearLayout
-      android:orientation="horizontal"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_alignParentBottom="true"
-      android:layout_gravity="center"
-      android:paddingTop="10dip">
-      <LinearLayout
-        android:layout_width = "wrap_content"
-        android:layout_height= "wrap_content"
-        android:layout_weight="1"/>
-      <ImageButton
-        android:id="@+id/showOptions"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:visibility="visible"
-        android:src="@android:drawable/ic_menu_more"/>
-    </LinearLayout>
 </RelativeLayout>

MyTracks/res/layout/mytracks_list.xml

@@ -1,58 +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.apps.mytracks"
-  android:id="@+id/tracklist_root"
-  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/track_list_pick_one"
-      android:layout_weight="0"/>
-  </LinearLayout>
-  <ListView android:id="@android:id/list"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"/>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button android:id="@+id/tracklist_btn_import_all"
-      android:layout_gravity="left"
-      android:text="@string/track_list_import_all"
-      style="@style/Button"/>
-    <Button android:id="@+id/tracklist_btn_export_all"
-      android:layout_gravity="center_horizontal"
-      android:text="@string/track_list_export_all"
-      style="@style/Button"/>
-    <Button android:id="@+id/tracklist_btn_delete_all"
-      android:layout_gravity="right"
-      android:text="@string/track_list_delete_all"
-      style="@style/Button"/>
-    <LinearLayout style="@style/ButtonSpacer"/>
-  </LinearLayout>
-</LinearLayout>