karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2012-05-01 18:05:53 -07:00
parent 52253afd3a
commit 66ba54ffa0
113 changed files with 1122 additions and 1956 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/about.xml
+14 -43
View File
@@ -15,64 +15,35 @@ 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="fill_parent"
android:layout_width="fill_parent" >
style="@style/ScrollView" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical"
android:padding="8dp" >
<TextView
android:drawableLeft="@drawable/arrow_icon"
android:drawablePadding="8dp"
android:gravity="center"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
style="@android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/about_copyright_notice" />
android:text="@string/about_copyright_notice"
style="@style/TextMedium.WithIcon" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
style="@android:style/TextAppearance.DeviceDefault.Large"
android:text="@string/about_version" />
android:text="@string/about_version"
style="@style/TextLarge" />
<TextView
android:id="@+id/about_version"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:paddingLeft="48dp"
style="@android:style/TextAppearance.DeviceDefault.Medium" />
style="@style/AboutValue" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
style="@android:style/TextAppearance.DeviceDefault.Large"
android:text="@string/about_support" />
android:text="@string/about_support"
style="@style/TextLarge" />
<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_support_url" />
android:text="@string/my_tracks_support_url"
style="@style/AboutValue" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
style="@android:style/TextAppearance.DeviceDefault.Large"
android:text="@string/about_privacy" />
android:text="@string/about_privacy"
style="@style/TextLarge" />
<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" />
android:text="@string/my_tracks_privacy_url"
style="@style/AboutValue" />
</LinearLayout>
</ScrollView>
MyTracks/res/layout/aggregated_stats.xml
+27
View File
@@ -0,0 +1,27 @@
<?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.
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/ScrollView">
<TableLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:padding="8dp"
android:shrinkColumns="0,2"
android:stretchColumns="0,2" >
<include layout="@layout/stats_core" />
</TableLayout>
</ScrollView>
MyTracks/res/layout/chart.xml
+35
View File
@@ -0,0 +1,35 @@
<?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:id="@+id/chart_view_layout"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="fill_parent"
android:orientation="vertical" >
</LinearLayout>
<ZoomControls
android:background="@android:color/white"
android:gravity="right"
android:id="@+id/chart_zoom_controls"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:paddingRight="8dp" />
</LinearLayout>
MyTracks/res/layout/chart_settings.xml
+19 -54
View File
@@ -15,87 +15,52 @@ 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="fill_parent"
android:layout_width="fill_parent" >
style="@style/ScrollView" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
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="wrap_content"
style="@android:style/TextAppearance.DeviceDefault.Large"
android:text="@string/chart_settings_x_axis" />
android:text="@string/chart_settings_x_axis"
style="@style/TextLarge.WithIcon" />
<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="wrap_content"
style="@android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/chart_settings_by_distance" />
android:text="@string/chart_settings_by_distance"
style="@style/TextMedium" />
<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" />
android:text="@string/chart_settings_by_time"
style="@style/TextMedium" />
</RadioGroup>
<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" />
android:text="@string/chart_settings_y_axis"
style="@style/TextLarge.WithIcon" />
<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" />
android:text="@string/stats_elevation"
style="@style/TextMedium" />
<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" />
android:text="@string/stats_speed"
style="@style/TextMedium" />
<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" />
android:text="@string/sensor_state_power"
style="@style/TextMedium" />
<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" />
android:text="@string/sensor_state_cadence"
style="@style/TextMedium" />
<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" />
android:text="@string/sensor_state_heart_rate"
style="@style/TextMedium" />
</LinearLayout>
</ScrollView>
MyTracks/res/layout/choose_map.xml
+6 -23
View File
@@ -14,32 +14,15 @@ 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"
<merge 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"/>
android:layout_width="fill_parent" >
<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"/>
android:layout_width="fill_parent" />
<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>
style="@style/ListEmptyTextView" >
</TextView>
</merge>
MyTracks/res/layout/choose_map_item.xml
+14 -24
View File
@@ -15,33 +15,23 @@ 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:gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical"
android:paddingBottom="2dp"
android:paddingTop="2dp">
android:padding="8dp" >
<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"/>
android:id="@+id/choose_map_item_title"
android:singleLine="true"
style="@style/TextLarge" />
<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"/>
android:id="@+id/choose_map_item_description"
android:singleLine="false"
android:textColor="@android:color/secondary_text_dark"
style="@style/TextSmall" />
<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>
android:id="@+id/choose_map_item_search_status"
android:singleLine="true"
style="@style/TextSmall" />
</LinearLayout>
MyTracks/res/layout/help.xml
+2 -5
View File
@@ -18,11 +18,8 @@ limitations under the License.
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="vertical" >
<ScrollView
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="fill_parent" >
<include layout="@layout/welcome" />
<ScrollView style="@style/ScrollView.WithBottomButtons" >
<include layout="@layout/help_content" />
</ScrollView>
<LinearLayout style="@style/BottomButtonBar" >
<include layout="@layout/help_buttons" />
MyTracks/res/layout/list_item.xml
+11 -6
View File
@@ -27,10 +27,13 @@ limitations under the License.
android:orientation="horizontal" >
<TextView
android:id="@+id/list_item_name"
style="@style/ListItemName" />
android:singleLine="true"
style="@style/TextLarge.WithIcon" />
<TextView
android:id="@+id/list_item_category"
style="@style/ListItemCategory" />
android:layout_marginLeft="8dp"
android:singleLine="true"
style="@style/TextSmall" />
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
@@ -39,16 +42,18 @@ limitations under the License.
<TextView
android:id="@+id/list_item_total_time"
android:layout_marginRight="8dp"
style="@style/ListItemStat" />
style="@style/ListItemStats" />
<TextView
android:id="@+id/list_item_total_distance"
android:layout_marginRight="8dp"
style="@style/ListItemStat" />
style="@style/ListItemStats" />
<TextView
android:id="@+id/list_item_start_time"
style="@style/ListItemStat" />
style="@style/ListItemStats" />
</LinearLayout>
<TextView
android:id="@+id/list_item_description"
style="@style/ListItemDescription" />
android:singleLine="false"
android:textColor="@android:color/secondary_text_dark"
style="@style/TextSmall" />
</LinearLayout>
MyTracks/res/layout/map.xml
+40
View File
@@ -0,0 +1,40 @@
<?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.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent"
android:layout_width="fill_parent" >
<!-- apiKey corresponds to certificate md5: 81:DF:A2:63:53:C7:6B:1E:6C:24:62:D4:91:1C:36:3A -->
<com.google.android.maps.MapView
android:apiKey="0TXoRmxTinrZKQ9JSazj-9A34XX6_lXsRvTpXWA"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:id="@+id/map_view"
android:layout_height="fill_parent"
android:layout_width="fill_parent" />
<TextView
android:background="@color/background_warning"
android:drawableLeft="@android:drawable/ic_dialog_alert"
android:gravity="center"
android:id="@+id/map_message"
android:layout_alignParentTop="true"
android:layout_width="fill_parent"
android:padding="8dp"
android:textColor="@android:color/primary_text_dark"
android:visibility="gone"
style="@style/TextMedium.WithIcon" />
</RelativeLayout>
MyTracks/res/layout/marker_detail.xml
+6 -119
View File
@@ -15,8 +15,7 @@ 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="fill_parent"
android:layout_width="fill_parent" >
style="@style/ScrollView" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
@@ -24,7 +23,7 @@ limitations under the License.
android:padding="8dp" >
<TextView
android:id="@+id/marker_detail_name"
style="@style/MarkerDetailLabel" />
style="@style/TextLarge" />
<LinearLayout
android:id="@+id/marker_detail_waypoint_section"
android:layout_height="wrap_content"
@@ -32,131 +31,19 @@ limitations under the License.
android:orientation="vertical" >
<TextView
android:id="@+id/marker_detail_marker_type"
style="@style/MarkerDetailLabel" />
style="@style/TextLarge" />
<TextView
android:id="@+id/marker_detail_description"
style="@style/MarkerDetailLabel" />
style="@style/TextLarge" />
</LinearLayout>
<TableLayout
android:id="@+id/marker_detail_statistics_section"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:paddingTop="8dp"
android:shrinkColumns="0,2"
android:stretchColumns="0,2" >
<!-- Total distance and max speed (fastest pace) -->
<TableRow>
<TextView
android:text="@string/stat_total_distance"
style="@style/MarkerDetailStatisticsLabel" />
<TextView
android:id="@+id/marker_detail_max_speed_label"
android:layout_column="2"
style="@style/MarkerDetailStatisticsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/marker_detail_total_distance_value"
style="@style/MarkerDetailStatisticsValue" />
<TextView style="@style/MarkerDetailStatisticsSpacer" />
<TextView
android:id="@+id/marker_detail_max_speed_value"
style="@style/MarkerDetailStatisticsValue" />
</TableRow>
<!-- Total time and average speed (average pace) -->
<TableRow>
<TextView
android:text="@string/stat_total_time"
style="@style/MarkerDetailStatisticsLabel" />
<TextView
android:id="@+id/marker_detail_average_speed_label"
android:layout_column="2"
style="@style/MarkerDetailStatisticsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/marker_detail_total_time_value"
style="@style/MarkerDetailStatisticsValue" />
<TextView style="@style/MarkerDetailStatisticsSpacer" />
<TextView
android:id="@+id/marker_detail_average_speed_value"
style="@style/MarkerDetailStatisticsValue" />
</TableRow>
<!-- Moving time and average moving speed (average moving pace) -->
<TableRow>
<TextView
android:text="@string/stat_moving_time"
style="@style/MarkerDetailStatisticsLabel" />
<TextView
android:id="@+id/marker_detail_average_moving_speed_label"
android:layout_column="2"
style="@style/MarkerDetailStatisticsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/marker_detail_moving_time_value"
style="@style/MarkerDetailStatisticsValue" />
<TextView style="@style/MarkerDetailStatisticsSpacer" />
<TextView
android:id="@+id/marker_detail_average_moving_speed_value"
style="@style/MarkerDetailStatisticsValue" />
</TableRow>
<!-- Elevation and elevation gain -->
<TableRow>
<TextView
android:text="@string/stat_elevation"
style="@style/MarkerDetailStatisticsLabel" />
<TextView
android:layout_column="2"
android:text="@string/stat_elevation_gain"
style="@style/MarkerDetailStatisticsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/marker_detail_elevation_value"
style="@style/MarkerDetailStatisticsValue" />
<TextView style="@style/MarkerDetailStatisticsSpacer" />
<TextView
android:id="@+id/marker_detail_elevation_gain_value"
style="@style/MarkerDetailStatisticsValue" />
</TableRow>
<!-- Min and max elevation -->
<TableRow>
<TextView
android:text="@string/stat_min_elevation"
style="@style/MarkerDetailStatisticsLabel" />
<TextView
android:layout_column="2"
android:text="@string/stat_max_elevation"
style="@style/MarkerDetailStatisticsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/marker_detail_min_elevation_value"
style="@style/MarkerDetailStatisticsValue" />
<TextView style="@style/MarkerDetailStatisticsSpacer" />
<TextView
android:id="@+id/marker_detail_max_elevation_value"
style="@style/MarkerDetailStatisticsValue" />
</TableRow>
<!-- Min and max grade -->
<TableRow>
<TextView
android:text="@string/stat_min_grade"
style="@style/MarkerDetailStatisticsLabel" />
<TextView
android:layout_column="2"
android:text="@string/stat_max_grade"
style="@style/MarkerDetailStatisticsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/marker_detail_min_grade_value"
style="@style/MarkerDetailStatisticsValue" />
<TextView style="@style/MarkerDetailStatisticsSpacer" />
<TextView
android:id="@+id/marker_detail_max_grade_value"
style="@style/MarkerDetailStatisticsValue" />
</TableRow>
<include layout="@layout/stats_core" />
</TableLayout>
</LinearLayout>
</ScrollView>
MyTracks/res/layout/marker_edit.xml
+7 -10
View File
@@ -18,10 +18,7 @@ limitations under the License.
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="vertical" >
<ScrollView
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="fill_parent" >
<ScrollView style="@style/ScrollView.WithBottomButtons" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
@@ -34,7 +31,7 @@ limitations under the License.
android:orientation="vertical" >
<TextView
android:text="@string/marker_edit_type"
style="@style/EditLabel" />
style="@style/TextMedium" />
<RadioGroup
android:id="@+id/marker_edit_type"
android:layout_height="wrap_content"
@@ -42,16 +39,16 @@ limitations under the License.
<RadioButton
android:id="@+id/marker_edit_type_statistics"
android:text="@string/marker_edit_type_statistics"
style="@style/EditLabel" />
style="@style/TextMedium" />
<RadioButton
android:id="@+id/marker_edit_type_waypoint"
android:text="@string/marker_edit_type_waypoint"
style="@style/EditLabel" />
style="@style/TextMedium" />
</RadioGroup>
</LinearLayout>
<TextView
android:text="@string/generic_name"
style="@style/EditLabel" />
style="@style/TextMedium" />
<EditText
android:hint="@string/generic_name"
android:id="@+id/marker_edit_name"
@@ -63,7 +60,7 @@ limitations under the License.
android:orientation="vertical" >
<TextView
android:text="@string/marker_edit_marker_type"
style="@style/EditLabel" />
style="@style/TextMedium" />
<AutoCompleteTextView
android:hint="@string/marker_edit_marker_type_hint"
android:id="@+id/marker_edit_marker_type"
@@ -71,7 +68,7 @@ limitations under the License.
style="@style/EditCategory" />
<TextView
android:text="@string/generic_description"
style="@style/EditLabel" />
style="@style/TextMedium" />
<EditText
android:hint="@string/generic_description"
android:id="@+id/marker_edit_description"
MyTracks/res/layout/marker_list.xml
+2 -2
View File
@@ -14,7 +14,7 @@ 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"
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent"
android:layout_width="fill_parent" >
<ListView
@@ -26,4 +26,4 @@ limitations under the License.
android:text="@string/marker_list_empty_message"
style="@style/ListEmptyTextView" >
</TextView>
</FrameLayout>
</merge>
MyTracks/res/layout/mytracks_charts.xml
-57
View File
@@ -1,57 +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.
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/elevation_root"
android:orientation="vertical"
android:layout_height="fill_parent"
android:layout_width="fill_parent">
<LinearLayout android:id="@+id/elevation_chart"
android:orientation="vertical"
android:layout_width="fill_parent"
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="10dp">
<ZoomControls android:id="@+id/elevation_zoom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_alignParentRight="true"/>
</RelativeLayout>
<LinearLayout android:id="@+id/elevation_busypane"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="3dp"
android:visibility="gone">
<ProgressBar
android:layout_weight="1"
android:layout_height="0dp"
android:layout_width="wrap_content"
android:maxWidth="80dp"
android:maxHeight="80dp"
android:minWidth="80dp"
android:minHeight="80dp"
android:layout_gravity="center"/>
</LinearLayout>
</RelativeLayout>
MyTracks/res/layout/mytracks_layout.xml
-62
View File
@@ -1,62 +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.
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/screen"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<com.google.android.maps.MapView android:id="@+id/map"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:clickable="true"
android:enabled="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:apiKey="0TXoRmxTinrZKQ9JSazj-9A34XX6_lXsRvTpXWA"/>
<!-- corresponding certificate md5: 81:DF:A2:63:53:C7:6B:1E:6C:24:62:D4:91:1C:36:3A -->
<LinearLayout android:id="@+id/messagepane"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_bar"
android:padding="3dp"
android:visibility="gone">
<TextView android:id="@+id/messagetext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="16dp"
android:textColor="#fff"
android:text="@string/gps_wait_for_fix"
android:layout_weight="1"/>
</LinearLayout>
<LinearLayout android:id="@+id/busypane"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="3dp"
android:visibility="gone">
<ProgressBar
android:layout_weight="1"
android:layout_height="0dp"
android:layout_width="wrap_content"
android:maxWidth="80dp"
android:maxHeight="80dp"
android:minWidth="80dp"
android:minHeight="80dp"
android:layout_gravity="center"/>
</LinearLayout>
</RelativeLayout>
MyTracks/res/layout/search_list.xml
+2 -2
View File
@@ -14,7 +14,7 @@ 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"
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent"
android:layout_width="fill_parent" >
<ListView
@@ -26,4 +26,4 @@ limitations under the License.
android:text="@string/search_list_empty_message"
style="@style/ListEmptyTextView" >
</TextView>
</FrameLayout>
</merge>
MyTracks/res/layout/sensor_state.xml
+50 -64
View File
@@ -14,67 +14,53 @@ 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">
<ScrollView
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="fill_parent">
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical">
<!-- Sensor state -->
<TextView
android:text="@string/menu_sensor_state"
style="@style/SensorStateLabel"/>
<TextView
android:id="@+id/sensor_state"
style="@style/SensorStateValue"/>
<!-- Last sensor time -->
<TextView
android:text="@string/sensor_state_last_sensor_time"
style="@style/SensorStateLabel"/>
<TextView
android:id="@+id/sensor_state_last_sensor_time"
style="@style/SensorStateValue"/>
<!-- Power -->
<TextView
android:text="@string/sensor_state_power"
style="@style/SensorStateLabel"/>
<TextView
android:id="@+id/sensor_state_power"
style="@style/SensorStateValue"/>
<!-- Cadence -->
<TextView
android:text="@string/sensor_state_cadence"
style="@style/SensorStateLabel"/>
<TextView
android:id="@+id/sensor_state_cadence"
style="@style/SensorStateValue"/>
<!-- Heart rate -->
<TextView
android:text="@string/sensor_state_heart_rate"
style="@style/SensorStateLabel"/>
<TextView
android:id="@+id/sensor_state_heart_rate"
style="@style/SensorStateValue"/>
<!-- Battery level -->
<TextView
android:text="@string/sensor_state_battery"
style="@style/SensorStateLabel"/>
<TextView
android:id="@+id/sensor_state_battery"
style="@style/SensorStateValue"/>
</LinearLayout>
</ScrollView>
</LinearLayout>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/ScrollView" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical"
android:padding="8dp" >
<TextView
android:text="@string/menu_sensor_state"
style="@style/TextMedium" />
<TextView
android:id="@+id/sensor_state"
style="@style/SensorStateValue" />
<!-- Last sensor time -->
<TextView
android:text="@string/sensor_state_last_sensor_time"
style="@style/TextMedium" />
<TextView
android:id="@+id/sensor_state_last_sensor_time"
style="@style/SensorStateValue" />
<!-- Power -->
<TextView
android:text="@string/sensor_state_power"
style="@style/TextMedium" />
<TextView
android:id="@+id/sensor_state_power"
style="@style/SensorStateValue" />
<!-- Cadence -->
<TextView
android:text="@string/sensor_state_cadence"
style="@style/TextMedium" />
<TextView
android:id="@+id/sensor_state_cadence"
style="@style/SensorStateValue" />
<!-- Heart rate -->
<TextView
android:text="@string/sensor_state_heart_rate"
style="@style/TextMedium" />
<TextView
android:id="@+id/sensor_state_heart_rate"
style="@style/SensorStateValue" />
<!-- Battery level -->
<TextView
android:text="@string/sensor_state_battery"
style="@style/TextMedium" />
<TextView
android:id="@+id/sensor_state_battery"
style="@style/SensorStateValue" />
</LinearLayout>
</ScrollView>
MyTracks/res/layout/stats.xml
+39 -344
View File
@@ -14,349 +14,44 @@ 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.
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/stats_root"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_width="fill_parent">
<ScrollView
android:id="@+id/scrolly"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/ScrollView" >
<TableLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent">
<TableLayout
android:id="@+id/stats_table"
android:layout_height="wrap_content"
android:stretchColumns="1,4"
android:layout_width="fill_parent">
<!-- Layout the speed large on it's own line. -->
<TableRow>
<TextView
android:id="@+id/speed_label"
android:layout_span="5"
android:text="@string/stat_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
<TextView
style="@style/StatsRegister.Big"
android:id="@+id/speed_register"
android:layout_column="1"
android:layout_span="4"/>
<LinearLayout
android:gravity="bottom"
android:layout_column="5"
android:layout_width="wrap_content"
android:lines="1"
android:orientation="vertical">
<TextView
android:layout_height="fill_parent"
android:layout_width="fill_parent" />
<TextView
android:id="@+id/speed_unit_label_top"
style="@style/StatsUnit" />
<TextView
style="@style/StatsDivider" />
<TextView
android:id="@+id/speed_unit_label_bottom"
style="@style/StatsUnit" />
</LinearLayout>
</TableRow>
<!-- Total distance and max speed -->
<TableRow
android:padding="1dp">
<TextView
android:id="@+id/total_distance_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/stat_total_distance" />
<TextView
android:id="@+id/max_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/stat_max_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
<TextView
style="@style/StatsRegister"
android:id="@+id/total_distance_register"
android:layout_column="1" />
<TextView
android:id="@+id/total_distance_unit_label"
android:layout_column="2"
style="@style/StatsUnitSolo" />
<!-- TODO 4/08/2009
The following is a bad hack to get a spacer the same size as the
text. Ideally this should just be a View, however I don't know how to
set the view height properly. fill_parent on this element causes as
NullPointerException. This same filler is repeated on each line.-->
<TextView
style="@style/StatsSpacer"
android:layout_column="3"/>
<TextView
android:id="@+id/max_speed_register"
style="@style/StatsRegister"
android:layout_column="4" />
<LinearLayout
android:gravity="bottom"
android:layout_column="5"
android:layout_width="wrap_content"
android:lines="1"
android:orientation="vertical">
<TextView
android:id="@+id/max_speed_unit_label_top"
style="@style/StatsUnit" />
<TextView
style="@style/StatsDivider" />
<TextView
android:id="@+id/max_speed_unit_label_bottom"
style="@style/StatsUnit" />
</LinearLayout>
</TableRow>
<!-- Total time and average speed -->
<TableRow>
<TextView
android:id="@+id/track_time_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/stat_total_time" />
<TextView
android:id="@+id/average_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/stat_average_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
<TextView
android:id="@+id/total_time_register"
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_span="2"
android:layout_width="fill_parent"
style="@style/StatsRegister" />
<TextView
style="@style/StatsSpacer"
android:layout_column="3"/>
<TextView
android:id="@+id/average_speed_register"
android:layout_column="4"
style="@style/StatsRegister" />
<LinearLayout
android:gravity="bottom"
android:layout_column="5"
android:layout_width="wrap_content"
android:lines="1"
android:orientation="vertical">
<TextView
android:id="@+id/average_speed_unit_label_top"
style="@style/StatsUnit" />
<TextView
style="@style/StatsDivider" />
<TextView
android:id="@+id/average_speed_unit_label_bottom"
style="@style/StatsUnit" />
</LinearLayout>
</TableRow>
<!-- Moving time and average moving speed -->
<TableRow>
<TextView
android:id="@+id/moving_time_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/stat_moving_time" />
<TextView
android:id="@+id/average_moving_speed_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/stat_average_moving_speed" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
<TextView
android:id="@+id/moving_time_register"
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_span="2"
android:layout_width="fill_parent"
style="@style/StatsRegister" />
<TextView
style="@style/StatsSpacer"
android:layout_column="3"/>
<TextView
android:id="@+id/average_moving_speed_register"
style="@style/StatsRegister" />
<LinearLayout
android:gravity="bottom"
android:layout_column="5"
android:layout_width="wrap_content"
android:lines="1"
android:orientation="vertical">
<TextView
android:id="@+id/average_moving_speed_unit_label_top"
style="@style/StatsUnit" />
<TextView
style="@style/StatsDivider" />
<TextView
android:id="@+id/average_moving_speed_unit_label_bottom"
style="@style/StatsUnit" />
</LinearLayout>
</TableRow>
<!-- Elevation and elevation gain -->
<TableRow>
<TextView
android:id="@+id/elevation_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/stat_elevation" />
<TextView
android:id="@+id/elevation_gain_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/stat_elevation_gain" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
<TextView
android:id="@+id/elevation_register"
android:layout_column="1"
style="@style/StatsRegister" />
<TextView
android:id="@+id/elevation_unit_label"
android:layout_column="2"
style="@style/StatsUnitSolo" />
<TextView
style="@style/StatsSpacer"
android:layout_column="3"/>
<TextView
android:id="@+id/elevation_gain_register"
android:layout_column="4"
style="@style/StatsRegister" />
<TextView
android:id="@+id/elevation_gain_unit_label"
android:layout_column="5"
style="@style/StatsUnitSolo" />
</TableRow>
<!-- Min and max elevation -->
<TableRow>
<TextView
android:id="@+id/min_elevation_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/stat_min_elevation" />
<TextView
android:id="@+id/max_elevation_label"
android:layout_column="4"
android:layout_span="3"
android:text="@string/stat_max_elevation" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
<TextView
android:id="@+id/min_elevation_register"
android:layout_column="1"
style="@style/StatsRegister" />
<TextView
android:id="@+id/min_elevation_unit_label"
android:layout_column="2"
style="@style/StatsUnitSolo" />
<TextView
style="@style/StatsSpacer"
android:layout_column="3"/>
<TextView
android:id="@+id/max_elevation_register"
android:layout_column="4"
style="@style/StatsRegister" />
<TextView
android:id="@+id/max_elevation_unit_label"
android:layout_column="5"
style="@style/StatsUnitSolo" />
</TableRow>
<!-- Min and max grade -->
<TableRow>
<TextView
android:id="@+id/min_grade_label"
android:layout_column="1"
android:layout_span="3"
android:text="@string/stat_min_grade" />
<TextView
android:id="@+id/max_grade_label"
android:layout_column="4"
android:layout_span="2"
android:text="@string/stat_max_grade" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
<TextView
android:id="@+id/min_grade_register"
android:layout_column="1"
android:layout_span="2"
style="@style/StatsRegister" />
<TextView
style="@style/StatsSpacer"
android:layout_column="3"/>
<TextView
android:id="@+id/max_grade_register"
android:layout_column="4"
android:layout_span="2"
style="@style/StatsRegister" />
</TableRow>
<!-- Latitude and Longitude -->
<TableRow>
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/stat_latitude" />
<TextView
android:layout_column="4"
android:layout_span="2"
android:text="@string/stat_longitude" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
<TextView
android:id="@+id/latitude_register"
android:layout_column="1"
android:layout_span="2"
style="@style/StatsRegister.Small" />
<TextView
style="@style/StatsSpacer"
android:layout_column="3"
android:textSize="25sp" />
<TextView
android:id="@+id/longitude_register"
android:layout_column="4"
android:layout_span="2"
style="@style/StatsRegister.Small" />
</TableRow>
</TableLayout>
</ScrollView>
<LinearLayout android:id="@+id/stats_busypane"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="3dp"
android:visibility="gone">
<ProgressBar
android:layout_weight="1"
android:layout_height="0dp"
android:layout_width="wrap_content"
android:maxWidth="80dp"
android:maxHeight="80dp"
android:minWidth="80dp"
android:minHeight="80dp"
android:layout_gravity="center"/>
</LinearLayout>
</RelativeLayout>
android:padding="8dp"
android:shrinkColumns="0,2"
android:stretchColumns="0,2" >
<!-- Speed on one line -->
<TableRow>
<TextView
android:id="@+id/stats_speed_label"
style="@style/StatsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/stats_speed_value"
style="@style/StatsValue" />
</TableRow>
<include layout="@layout/stats_core" />
<!-- Latitude and longitude -->
<TableRow>
<TextView
android:text="@string/stats_latitude"
style="@style/StatsLabel" />
<TextView
android:layout_column="2"
android:text="@string/stats_longitude"
style="@style/StatsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/stats_latitude_value"
style="@style/StatsValue" />
<TextView style="@style/StatsSpacer" />
<TextView
android:id="@+id/stats_longitude_value"
style="@style/StatsValue" />
</TableRow>
</TableLayout>
</ScrollView>
MyTracks/res/layout/stats_core.xml
+132
View File
@@ -0,0 +1,132 @@
<?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.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- Total distance and max speed (fastest pace) -->
<TableRow>
<TextView
android:text="@string/stats_total_distance"
style="@style/StatsLabel" />
<TextView
android:id="@+id/stats_max_speed_label"
android:layout_column="2"
style="@style/StatsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/stats_total_distance_value"
style="@style/StatsValue" />
<TextView style="@style/StatsSpacer" />
<TextView
android:id="@+id/stats_max_speed_value"
style="@style/StatsValue" />
</TableRow>
<!-- Total time and average speed (average pace) -->
<TableRow>
<TextView
android:text="@string/stats_total_time"
style="@style/StatsLabel" />
<TextView
android:id="@+id/stats_average_speed_label"
android:layout_column="2"
style="@style/StatsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/stats_total_time_value"
style="@style/StatsValue" />
<TextView style="@style/StatsSpacer" />
<TextView
android:id="@+id/stats_average_speed_value"
style="@style/StatsValue" />
</TableRow>
<!-- Moving time and average moving speed (average moving pace) -->
<TableRow>
<TextView
android:text="@string/stats_moving_time"
style="@style/StatsLabel" />
<TextView
android:id="@+id/stats_average_moving_speed_label"
android:layout_column="2"
style="@style/StatsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/stats_moving_time_value"
style="@style/StatsValue" />
<TextView style="@style/StatsSpacer" />
<TextView
android:id="@+id/stats_average_moving_speed_value"
style="@style/StatsValue" />
</TableRow>
<!-- Elevation and elevation gain -->
<TableRow>
<TextView
android:text="@string/stats_elevation"
style="@style/StatsLabel" />
<TextView
android:layout_column="2"
android:text="@string/stats_elevation_gain"
style="@style/StatsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/stats_elevation_value"
style="@style/StatsValue" />
<TextView style="@style/StatsSpacer" />
<TextView
android:id="@+id/stats_elevation_gain_value"
style="@style/StatsValue" />
</TableRow>
<!-- Min and max elevation -->
<TableRow>
<TextView
android:text="@string/stats_min_elevation"
style="@style/StatsLabel" />
<TextView
android:layout_column="2"
android:text="@string/stats_max_elevation"
style="@style/StatsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/stats_min_elevation_value"
style="@style/StatsValue" />
<TextView style="@style/StatsSpacer" />
<TextView
android:id="@+id/stats_max_elevation_value"
style="@style/StatsValue" />
</TableRow>
<!-- Min and max grade -->
<TableRow>
<TextView
android:text="@string/stats_min_grade"
style="@style/StatsLabel" />
<TextView
android:layout_column="2"
android:text="@string/stats_max_grade"
style="@style/StatsLabel" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/stats_min_grade_value"
style="@style/StatsValue" />
<TextView style="@style/StatsSpacer" />
<TextView
android:id="@+id/stats_max_grade_value"
style="@style/StatsValue" />
</TableRow>
</merge>
MyTracks/res/layout/track_edit.xml
+4 -7
View File
@@ -18,10 +18,7 @@ limitations under the License.
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="vertical" >
<ScrollView
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="fill_parent" >
<ScrollView style="@style/ScrollView.WithBottomButtons" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
@@ -29,7 +26,7 @@ limitations under the License.
android:padding="8dp" >
<TextView
android:text="@string/generic_name"
style="@style/EditLabel" />
style="@style/TextMedium" />
<EditText
android:drawableLeft="@drawable/track"
android:hint="@string/generic_name"
@@ -38,7 +35,7 @@ limitations under the License.
style="@style/EditName" />
<TextView
android:text="@string/track_edit_activity_type"
style="@style/EditLabel" />
style="@style/TextMedium" />
<AutoCompleteTextView
android:hint="@string/track_edit_activity_type_hint"
android:id="@+id/track_edit_activity_type"
@@ -46,7 +43,7 @@ limitations under the License.
style="@style/EditCategory" />
<TextView
android:text="@string/generic_description"
style="@style/EditLabel" />
style="@style/TextMedium" />
<EditText
android:hint="@string/generic_description"
android:id="@+id/track_edit_description"
MyTracks/res/layout/track_list.xml
+3 -3
View File
@@ -14,7 +14,7 @@ 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"
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent"
android:layout_width="fill_parent" >
<ListView
@@ -26,7 +26,7 @@ limitations under the License.
android:id="@+id/track_list_empty"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="vertical">
android:orientation="vertical" >
<TextView
android:text="@string/track_list_empty_message"
style="@style/ListEmptyTextView" >
@@ -40,4 +40,4 @@ limitations under the License.
android:src="@drawable/menu_record_track"
style="@android:style/Widget.DeviceDefault.ImageButton" />
</LinearLayout>
</FrameLayout>
</merge>
MyTracks/res/layout/track_widget.xml
+60 -66
View File
@@ -14,77 +14,71 @@ 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"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@drawable/appwidget_background"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp">
<LinearLayout
android:paddingTop="5dp" >
<ImageButton
android:background="@android:color/transparent"
android:contentDescription="@string/my_tracks_app_name"
android:id="@+id/appwidget_button"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:background="@drawable/appwidget_background">
<ImageButton
android:id="@+id/appwidget_button"
android:layout_height="fill_parent"
android:layout_width="wrap_content"
android:background="@android:color/transparent"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:src="@drawable/appwidget_button_disabled" />
android:layout_width="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:src="@drawable/appwidget_button_disabled" />
<LinearLayout
android:clickable="true"
android:id="@+id/appwidget_track_statistics"
android:layout_height="fill_parent"
android:layout_weight="1"
android:layout_width="0dp"
android:orientation="vertical"
android:paddingLeft="16dp" >
<LinearLayout
android:id="@+id/appwidget_track_statistics"
android:layout_height="fill_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:clickable="true"
android:orientation="vertical"
android:paddingLeft="15dp">
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal">
<TextView
style="@style/WidgetTextView.Value"
android:id="@+id/appwidget_distance_text" />
<TextView
style="@style/WidgetTextView"
android:text="@string/stat_total_distance" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="@color/appwidget_hr" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal"
android:paddingBottom="2dp">
<TextView
style="@style/WidgetTextView.Value"
android:id="@+id/appwidget_time_text" />
<TextView
style="@style/WidgetTextView"
android:text="@string/stat_moving_time" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="@color/appwidget_hr" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal">
<TextView
style="@style/WidgetTextView.Value"
android:id="@+id/appwidget_speed_text" />
<TextView
style="@style/WidgetTextView"
android:text="@string/stat_speed" />
</LinearLayout>
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:id="@+id/appwidget_distance_text"
style="@style/TrackWidgetValue" />
<TextView
android:text="@string/stats_total_distance"
style="@style/TextSmall" />
</LinearLayout>
<LinearLayout
android:background="@color/appwidget_hr"
android:layout_height="1dp"
android:layout_width="fill_parent" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:id="@+id/appwidget_time_text"
style="@style/TrackWidgetValue" />
<TextView
android:text="@string/stats_moving_time"
style="@style/TextSmall" />
</LinearLayout>
<LinearLayout
android:background="@color/appwidget_hr"
android:layout_height="1dp"
android:layout_width="fill_parent" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:id="@+id/appwidget_speed_text"
style="@style/TrackWidgetValue" />
<TextView
android:text="@string/stats_speed"
style="@style/TextSmall" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/upload_result.xml
+14 -28
View File
@@ -15,13 +15,12 @@ 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="fill_parent"
android:layout_margin="8dp"
android:layout_width="fill_parent" >
style="@style/ScrollView" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical" >
android:orientation="vertical"
android:padding="8dp" >
<!-- Google Maps result -->
<LinearLayout
android:id="@+id/upload_result_maps_result"
@@ -36,20 +35,17 @@ limitations under the License.
android:layout_width="wrap_content"
android:src="@drawable/success" />
<LinearLayout
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical"
android:paddingLeft="8dp" >
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_maps"
style="@android:style/TextAppearance.DeviceDefault.Medium" />
style="@style/TextMedium" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_maps_url"
style="@android:style/TextAppearance.DeviceDefault.Small" />
style="@style/TextSmall" />
</LinearLayout>
</LinearLayout>
<!-- Google Fusion Tables result -->
@@ -66,20 +62,17 @@ limitations under the License.
android:layout_width="wrap_content"
android:src="@drawable/success" />
<LinearLayout
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical"
android:paddingLeft="8dp" >
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_fusion_tables"
style="@android:style/TextAppearance.DeviceDefault.Medium" />
style="@style/TextMedium" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_fusion_tables_url"
style="@android:style/TextAppearance.DeviceDefault.Small" />
style="@style/TextSmall" />
</LinearLayout>
</LinearLayout>
<!-- Google Docs result -->
@@ -96,36 +89,29 @@ limitations under the License.
android:layout_width="wrap_content"
android:src="@drawable/success" />
<LinearLayout
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical"
android:paddingLeft="8dp" >
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_docs"
style="@android:style/TextAppearance.DeviceDefault.Medium" />
style="@style/TextMedium" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_docs_url"
style="@android:style/TextAppearance.DeviceDefault.Small" />
style="@style/TextSmall" />
</LinearLayout>
</LinearLayout>
<!-- Footer -->
<TextView
android:id="@+id/upload_result_success_footer"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:padding="8dp"
android:text="@string/send_google_success_footer"
style="@android:style/TextAppearance.DeviceDefault.Small" />
style="@style/TextSmall" />
<TextView
android:id="@+id/upload_result_error_footer"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:padding="8dp"
android:text="@string/send_google_error"
style="@android:style/TextAppearance.DeviceDefault.Medium" />
style="@style/TextMedium" />
</LinearLayout>
</ScrollView>
MyTracks/res/layout/upload_service_chooser.xml
+13 -33
View File
@@ -15,27 +15,21 @@ 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="fill_parent"
android:layout_width="fill_parent" >
style="@style/ScrollView" >
<TableLayout
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_width="fill_parent"
android:padding="8dp"
android:stretchColumns="1" >
<TableRow android:id="@+id/send_google_maps_row" >
<ImageView
android:contentDescription="@string/send_google_maps"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/maps_icon" />
android:src="@drawable/maps_icon"
style="@style/UploadServiceChooserImageView" />
<CheckBox
android:id="@+id/send_google_maps"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_width="0dp"
android:text="@string/send_google_maps"
style="@android:style/TextAppearance.DeviceDefault.Medium" />
style="@style/UploadServiceChooserCheckBox" />
</TableRow>
<TableRow android:id="@+id/send_google_maps_option_row" >
<RadioGroup
@@ -45,47 +39,33 @@ limitations under the License.
android:layout_width="0dp" >
<RadioButton
android:id="@+id/send_google_new_map"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_new_map"
style="@android:style/TextAppearance.DeviceDefault.Medium" />
style="@style/TextMedium" />
<RadioButton
android:id="@+id/send_google_existing_map"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_existing_map"
style="@android:style/TextAppearance.DeviceDefault.Medium" />
style="@style/TextMedium" />
</RadioGroup>
</TableRow>
<TableRow android:id="@+id/send_google_fusion_tables_row" >
<ImageView
android:contentDescription="@string/send_google_fusion_tables"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/googledocs_icon" />
android:src="@drawable/googledocs_icon"
style="@style/UploadServiceChooserImageView" />
<CheckBox
android:id="@+id/send_google_fusion_tables"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_width="0dp"
android:text="@string/send_google_fusion_tables"
style="@android:style/TextAppearance.DeviceDefault.Medium" />
style="@style/UploadServiceChooserCheckBox" />
</TableRow>
<TableRow android:id="@+id/send_google_docs_row" >
<ImageView
android:contentDescription="@string/send_google_docs"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/googledocs_icon" />
android:src="@drawable/googledocs_icon"
style="@style/UploadServiceChooserImageView" />
<CheckBox
android:id="@+id/send_google_docs"
android:layout_gravity="center_vertical"
android:layout_height="fill_parent"
android:layout_marginLeft="8dp"
android:layout_width="0dp"
android:text="@string/send_google_docs"
style="@android:style/TextAppearance.DeviceDefault.Medium" />
style="@style/UploadServiceChooserCheckBox" />
</TableRow>
</TableLayout>
</ScrollView>
MyTracks/res/layout/welcome.xml
+2 -3
View File
@@ -15,7 +15,6 @@ 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="fill_parent"
android:layout_width="fill_parent" >
<include layout="@layout/help_content"/>
style="@style/ScrollView" >
<include layout="@layout/help_content" />
</ScrollView>