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-04-06 10:54:22 -07:00
parent 79fde1c118
commit f5085b208d
319 changed files with 6180 additions and 5754 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/about.xml
+45 -68
View File
@@ -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
+76 -94
View File
@@ -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
+8 -11
View File
@@ -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
+10 -31
View File
@@ -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
-58
View File
@@ -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>
MyTracks/res/layout/mytracks_list_item.xml
+13 -13
View File
@@ -19,32 +19,32 @@ limitations under the License.
android:layout_width="fill_parent"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical"
android:paddingBottom="2dip"
android:paddingTop="2dip">
android:paddingBottom="2dp"
android:paddingTop="2dp">
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal">
<ImageView android:id="@+id/track_list_item_icon"
android:contentDescription="@string/track_list_icon_description"
android:contentDescription="@string/track_icon_description"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:paddingLeft="4dip"
android:paddingRight="2dip"
android:paddingTop="5dip"
android:paddingLeft="4dp"
android:paddingRight="2dp"
android:paddingTop="5dp"
android:src="@drawable/track" />
<TextView android:id="@+id/track_list_item_name"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginTop="6dip"
android:layout_marginLeft="6dp"
android:layout_marginTop="6dp"
android:layout_width="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceLarge"/>
<TextView android:id="@+id/track_list_item_category"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginTop="6dip"
android:layout_marginLeft="6dp"
android:layout_marginTop="6dp"
android:layout_width="fill_parent"
android:singleLine = "true"
android:textAppearance="?android:attr/textAppearanceSmall"/>
@@ -53,21 +53,21 @@ limitations under the License.
<TextView android:id="@+id/track_list_item_time"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginLeft="6dp"
android:singleLine="true"
android:textColor="#fff"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView android:id="@+id/track_list_item_stats"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginLeft="6dp"
android:singleLine="true"
android:textColor="#0f0"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView android:id="@+id/track_list_item_description"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft = "6dip"
android:layout_marginLeft = "6dp"
android:singleLine = "false"
android:textAppearance="?android:attr/textAppearanceSmall"/>
MyTracks/res/layout/mytracks_marker_item.xml
+37 -44
View File
@@ -15,54 +15,47 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:paddingTop="2dip"
android:paddingBottom="2dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical">
android:orientation="horizontal"
android:paddingBottom="2dp"
android:paddingTop="2dp" >
<ImageView
android:contentDescription="@string/marker_icon_description"
android:id="@+id/waypointslist_item_icon"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_marginTop="6dp"
android:layout_width="wrap_content"
android:src="@drawable/ylw_pushpin" />
<LinearLayout
android:orientation="horizontal"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<ImageView android:id="@+id/waypointslist_item_icon"
android:layout_width="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/waypointslist_item_name"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginTop="6dip"
android:src="@drawable/ylw_pushpin"
android:contentDescription="@string/marker_list_icon_description"/>
<LinearLayout
android:orientation="vertical"
android:layout_marginLeft="6dp"
android:layout_marginTop="6dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/waypointslist_item_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginTop="6dip"
android:singleLine = "true"
android:textAppearance="?android:attr/textAppearanceLarge"/>
<TextView android:id="@+id/waypointslist_item_time"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft = "6dip"
android:singleLine = "true"
android:textColor = "#fff"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView android:id="@+id/waypointslist_item_category"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft = "6dip"
android:singleLine = "true"
android:textColor="#0f0"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/waypointslist_item_time"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_width="fill_parent"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#fff" />
<TextView
android:id="@+id/waypointslist_item_category"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_width="fill_parent"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#0f0" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/mytracks_waypoint_details.xml
+77 -78
View File
@@ -21,7 +21,7 @@ limitations under the License.
android:background="#c000">
<ScrollView
android:id="@+id/scrolly"
android:layout_height="0dip"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="fill_parent"
android:scrollbarStyle="insideInset">
@@ -38,18 +38,18 @@ limitations under the License.
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView android:id="@+id/waypointdetails_icon"
android:contentDescription="@string/marker_icon_description"
android:src="@drawable/ylw_pushpin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingLeft="4dip"
android:paddingRight="2dip"/>
android:paddingLeft="4dp"
android:paddingRight="2dp"/>
<EditText android:id="@+id/waypointdetails_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:autoText="true"
android:capitalize="words"
android:inputType="textAutoCorrect|textCapWords"
android:selectAllOnFocus="true"
android:hint="@string/marker_detail_marker_name"
android:imeOptions="actionNext"/>
@@ -57,7 +57,7 @@ limitations under the License.
<LinearLayout android:id="@+id/waypointdetails_description_layout"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_height="0dp"
android:visibility="visible"
android:layout_weight="1">
<TextView android:id="@+id/waypointdetails_category_label"
@@ -75,10 +75,9 @@ limitations under the License.
android:layout_height="wrap_content"/>
<EditText android:id="@+id/waypointdetails_description"
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_height="0dp"
android:singleLine="false"
android:autoText="true"
android:capitalize="sentences"
android:inputType="textAutoCorrect|textCapSentences"
android:selectAllOnFocus="true"
android:minLines="5"
android:maxLines="50"
@@ -90,13 +89,13 @@ limitations under the License.
<TableLayout android:id="@+id/waypoint_stats"
android:visibility="gone"
android:padding="2dip"
android:padding="2dp"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:stretchColumns="1,4">
<!-- Total distance and max speed -->
<TableRow
android:padding="1dip">
android:padding="1dp">
<TextView
android:id="@+id/total_distance_label"
android:layout_column="1"
@@ -114,8 +113,8 @@ limitations under the License.
android:gravity="right"
android:id="@+id/total_distance_register"
android:layout_column="1"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -123,8 +122,8 @@ limitations under the License.
android:gravity="left"
android:id="@+id/total_distance_unit_label"
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/unit_mile"
android:textColor="@color/stat_label_text" />
<!-- TODO 4/08/2009
@@ -135,16 +134,16 @@ limitations under the License.
<TextView
android:background="@color/black"
android:layout_column="3"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_width="5dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="5dp"
android:textSize="40sp" />
<TextView
android:gravity="right"
android:id="@+id/max_speed_register"
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -158,20 +157,20 @@ limitations under the License.
android:id="@+id/max_speed_unit_label_top"
android:gravity="bottom"
android:layout_height="wrap_content"
android:layout_marginBottom="-1dip"
android:layout_marginTop="-1dip"
android:layout_marginBottom="-1dp"
android:layout_marginTop="-1dp"
android:layout_width="wrap_content"
android:textColor="@color/stat_label_text" />
<TextView
android:background="@color/black"
android:layout_height="3dip"
android:layout_height="3dp"
android:layout_width="fill_parent" />
<TextView
android:id="@+id/max_speed_unit_label_bottom"
android:gravity="bottom"
android:layout_height="wrap_content"
android:layout_marginBottom="-1dip"
android:layout_marginTop="-1dip"
android:layout_marginBottom="-1dp"
android:layout_marginTop="-1dp"
android:layout_width="wrap_content"
android:textColor="@color/stat_label_text" />
</LinearLayout>
@@ -197,8 +196,8 @@ limitations under the License.
android:id="@+id/total_time_register"
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_span="2"
android:layout_width="fill_parent"
android:text="@string/value_unknown"
@@ -207,16 +206,16 @@ limitations under the License.
<TextView
android:background="@color/black"
android:layout_column="3"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_width="5dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="5dp"
android:textSize="40sp" />
<TextView
android:gravity="right"
android:id="@+id/average_speed_register"
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -230,20 +229,20 @@ limitations under the License.
android:id="@+id/average_speed_unit_label_top"
android:gravity="bottom"
android:layout_height="wrap_content"
android:layout_marginBottom="-1dip"
android:layout_marginTop="-1dip"
android:layout_marginBottom="-1dp"
android:layout_marginTop="-1dp"
android:layout_width="wrap_content"
android:textColor="@color/stat_label_text" />
<TextView
android:background="@color/black"
android:layout_height="3dip"
android:layout_height="3dp"
android:layout_width="fill_parent" />
<TextView
android:id="@+id/average_speed_unit_label_bottom"
android:gravity="bottom"
android:layout_height="wrap_content"
android:layout_marginBottom="-1dip"
android:layout_marginTop="-1dip"
android:layout_marginBottom="-1dp"
android:layout_marginTop="-1dp"
android:layout_width="wrap_content"
android:textColor="@color/stat_label_text" />
</LinearLayout>
@@ -269,8 +268,8 @@ limitations under the License.
android:id="@+id/moving_time_register"
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="fill_parent"
android:layout_span="2"
android:text="@string/value_unknown"
@@ -279,16 +278,16 @@ limitations under the License.
<TextView
android:background="@color/black"
android:layout_column="3"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_width="5dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="5dp"
android:textSize="40sp" />
<TextView
android:gravity="right"
android:id="@+id/average_moving_speed_register"
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -302,20 +301,20 @@ limitations under the License.
android:id="@+id/average_moving_speed_unit_label_top"
android:gravity="bottom"
android:layout_height="wrap_content"
android:layout_marginBottom="-1dip"
android:layout_marginTop="-1dip"
android:layout_marginBottom="-1dp"
android:layout_marginTop="-1dp"
android:layout_width="wrap_content"
android:textColor="@color/stat_label_text" />
<TextView
android:background="@color/black"
android:layout_height="3dip"
android:layout_height="3dp"
android:layout_width="fill_parent" />
<TextView
android:id="@+id/average_moving_speed_unit_label_bottom"
android:gravity="bottom"
android:layout_height="wrap_content"
android:layout_marginBottom="-1dip"
android:layout_marginTop="-1dip"
android:layout_marginBottom="-1dp"
android:layout_marginTop="-1dp"
android:layout_width="wrap_content"
android:textColor="@color/stat_label_text" />
</LinearLayout>
@@ -340,8 +339,8 @@ limitations under the License.
android:gravity="right"
android:id="@+id/elevation_register"
android:layout_column="1"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -349,23 +348,23 @@ limitations under the License.
android:gravity="left"
android:id="@+id/elevation_unit_label"
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text"/>
<TextView
android:background="@color/black"
android:layout_column="3"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_width="5dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="5dp"
android:textSize="40sp" />
<TextView
android:gravity="right"
android:id="@+id/elevation_gain_register"
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -373,8 +372,8 @@ limitations under the License.
android:gravity="left"
android:id="@+id/elevation_gain_unit_label"
android:layout_column="5"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
</TableRow>
@@ -398,8 +397,8 @@ limitations under the License.
android:gravity="right"
android:id="@+id/min_elevation_register"
android:layout_column="1"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -407,23 +406,23 @@ limitations under the License.
android:gravity="left"
android:id="@+id/min_elevation_unit_label"
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
<TextView
android:background="@color/black"
android:layout_column="3"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_width="5dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="5dp"
android:textSize="40sp" />
<TextView
android:gravity="right"
android:id="@+id/max_elevation_register"
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -431,8 +430,8 @@ limitations under the License.
android:id="@+id/max_elevation_unit_label"
android:gravity="left"
android:layout_column="5"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
</TableRow>
@@ -457,8 +456,8 @@ limitations under the License.
android:id="@+id/min_grade_register"
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="fill_parent"
android:layout_span="2"
android:text="@string/value_unknown"
@@ -467,17 +466,17 @@ limitations under the License.
<TextView
android:background="@color/black"
android:layout_column="3"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_width="5dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="5dp"
android:textSize="40sp" />
<TextView
android:gravity="right"
android:id="@+id/max_grade_register"
android:layout_column="4"
android:layout_height="wrap_content"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="fill_parent"
android:layout_span="2"
android:text="@string/value_unknown"
MyTracks/res/layout/mytracks_waypoints_list.xml
+4 -4
View File
@@ -26,14 +26,14 @@ limitations under the License.
android:layout_height="wrap_content"
android:background="@drawable/list_bar"
android:layout_weight="0"
android:padding="3dip">
android:padding="3dp">
<TextView android:id="@+id/message"
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/marker_list_pick_one"
android:layout_weight="0"/>
android:layout_weight="1"/>
</LinearLayout>
<ListView android:id="@android:id/list"
MyTracks/res/layout/search_list.xml
+1 -1
View File
@@ -28,7 +28,7 @@ limitations under the License.
android:layout_width="fill_parent"
android:text="@string/search_no_results"
android:textColor="@android:color/white"
android:textSize="20dip"
android:textSize="20dp"
android:textStyle="bold"
android:visibility="gone" />
</LinearLayout>
MyTracks/res/layout/stats.xml
+7 -10
View File
@@ -68,7 +68,7 @@ limitations under the License.
<!-- Total distance and max speed -->
<TableRow
android:padding="1dip">
android:padding="1dp">
<TextView
android:id="@+id/total_distance_label"
android:layout_column="1"
@@ -204,8 +204,6 @@ limitations under the License.
style="@style/StatsUnit" />
<TextView
style="@style/StatsDivider" />
android:layout_height="3dip"
android:layout_width="fill_parent" />
<TextView
android:id="@+id/average_moving_speed_unit_label_bottom"
style="@style/StatsUnit" />
@@ -349,17 +347,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/track_detail.xml → MyTracks/res/layout/track_edit.xml
+14 -15
View File
@@ -35,7 +35,7 @@ limitations under the License.
<TextView
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/track_detail_track_name"
android:text="@string/track_edit_track_name"
/>
<LinearLayout
android:layout_height="wrap_content"
@@ -43,6 +43,7 @@ limitations under the License.
android:orientation="horizontal"
>
<ImageView
android:contentDescription="@string/track_icon_description"
android:layout_gravity="center"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -51,10 +52,9 @@ limitations under the License.
android:src="@drawable/track"
/>
<EditText
android:autoText="true"
android:capitalize="words"
android:hint="@string/track_detail_track_name"
android:id="@+id/track_detail_track_name"
android:inputType="textAutoCorrect|textCapWords"
android:hint="@string/track_edit_track_name"
android:id="@+id/track_edit_track_name"
android:imeOptions="actionNext"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
@@ -65,25 +65,24 @@ limitations under the License.
<TextView
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/track_detail_activity_type"
android:text="@string/track_edit_activity_type"
/>
<AutoCompleteTextView
android:id="@+id/track_detail_activity_type"
android:id="@+id/track_edit_activity_type"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:hint="@string/track_detail_activity_type_hint"
android:hint="@string/track_edit_activity_type_hint"
android:imeOptions="actionNext"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/track_detail_track_description"
android:text="@string/track_edit_track_description"
/>
<EditText
android:autoText="true"
android:capitalize="sentences"
android:hint="@string/track_detail_track_description"
android:id="@+id/track_detail_track_description"
android:inputType="textAutoCorrect|textCapSentences"
android:hint="@string/track_edit_track_description"
android:id="@+id/track_edit_track_description"
android:imeOptions="actionDone"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
@@ -96,13 +95,13 @@ limitations under the License.
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button
android:id="@+id/track_detail_save"
android:id="@+id/track_edit_save"
android:layout_gravity="left"
android:text="@string/generic_save"
style="@style/Button"
/>
<Button
android:id="@+id/track_detail_cancel"
android:id="@+id/track_edit_cancel"
android:layout_gravity="right"
android:text="@string/generic_cancel"
style="@style/Button"
MyTracks/res/layout/track_list.xml
+25
View File
@@ -0,0 +1,25 @@
<?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" >
<ListView
android:id="@+id/track_list"
android:layout_height="fill_parent"
android:layout_width="fill_parent" />
</LinearLayout>
MyTracks/res/layout/track_list_item.xml
+65
View File
@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical"
android:padding="8dp" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:drawablePadding="8dp"
android:id="@+id/track_list_item_name"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:singleLine="true"
style="@android:style/TextAppearance.DeviceDefault.Large" />
<TextView
android:id="@+id/track_list_item_category"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_width="wrap_content"
android:singleLine="true"
style="@android:style/TextAppearance.DeviceDefault.Small" />
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:id="@+id/track_list_item_time"
style="@style/TrackListItemStatsTextView" />
<TextView
android:id="@+id/track_list_item_distance"
android:layout_marginLeft="8dp"
style="@style/TrackListItemStatsTextView" />
<TextView
android:id="@+id/track_list_item_start"
android:layout_marginLeft="8dp"
style="@style/TrackListItemStatsTextView" />
</LinearLayout>
<TextView
android:id="@+id/track_list_item_description"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:singleLine="false"
style="@android:style/TextAppearance.DeviceDefault.Small" />
</LinearLayout>
MyTracks/res/layout/track_widget.xml
+13 -13
View File
@@ -19,10 +19,10 @@ limitations under the License.
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingLeft="10px"
android:paddingRight="10px"
android:paddingTop="5px"
android:paddingBottom="5px">
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp">
<LinearLayout
android:layout_height="fill_parent"
android:layout_width="fill_parent"
@@ -32,17 +32,17 @@ limitations under the License.
android:layout_height="fill_parent"
android:layout_width="wrap_content"
android:background="@android:color/transparent"
android:paddingLeft="10px"
android:paddingRight="10px"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:src="@drawable/appwidget_button_disabled" />
<LinearLayout
android:id="@+id/appwidget_track_statistics"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:clickable="true"
android:orientation="vertical"
android:paddingLeft="15px">
android:paddingLeft="15dp">
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
@@ -54,15 +54,15 @@ limitations under the License.
style="@style/WidgetTextView"
android:text="@string/stat_total_distance" />
</LinearLayout>
<ImageView
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="1px"
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="2px">
android:paddingBottom="2dp">
<TextView
style="@style/WidgetTextView.Value"
android:id="@+id/appwidget_time_text" />
@@ -70,9 +70,9 @@ limitations under the License.
style="@style/WidgetTextView"
android:text="@string/stat_moving_time" />
</LinearLayout>
<ImageView
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="1px"
android:layout_height="1dp"
android:background="@color/appwidget_hr" />
<LinearLayout
android:layout_height="wrap_content"
MyTracks/res/layout/upload_result.xml
+104 -116
View File
@@ -14,130 +14,118 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical">
<ScrollView
android:layout_height="0dp"
android:layout_margin="5dp"
android:layout_weight="1"
android:layout_width="fill_parent">
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent"
android:layout_margin="8dp"
android:layout_width="fill_parent" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical" >
<!-- Google Maps result -->
<LinearLayout
android:id="@+id/upload_result_maps_result"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical">
<!-- Header -->
<TextView
android:layout_width="fill_parent"
android:layout_width="wrap_content"
android:orientation="horizontal" >
<ImageView
android:contentDescription="@string/generic_success_title"
android:id="@+id/upload_result_maps_result_icon"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:text="@string/send_google_result_header"
style="?android:attr/textAppearanceLarge"/>
<!-- Google Maps result -->
android:layout_width="wrap_content"
android:src="@drawable/success" />
<LinearLayout
android:id="@+id/upload_result_maps_result"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal">
<ImageView
android:id="@+id/upload_result_maps_result_icon"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:orientation="vertical"
android:paddingLeft="8dp" >
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/success"/>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical">
<TextView
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/send_google_maps"
style="?android:attr/textAppearanceMedium"/>
<TextView
android:id="@+id/upload_result_list_item_url"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/send_google_maps_url"
style="?android:attr/textAppearanceSmall"/>
</LinearLayout>
</LinearLayout>
<!-- Google Fusion Tables result -->
<LinearLayout
android:id="@+id/upload_result_fusion_tables_result"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal">
<ImageView
android:id="@+id/upload_result_fusion_tables_result_icon"
android:layout_gravity="center_vertical"
android:text="@string/send_google_maps"
style="@android:style/TextAppearance.DeviceDefault.Medium" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/success"/>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical">
<TextView
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/send_google_fusion_tables"
style="?android:attr/textAppearanceMedium"/>
<TextView
android:id="@+id/upload_result_list_item_url"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/send_google_fusion_tables_url"
style="?android:attr/textAppearanceSmall"/>
</LinearLayout>
android:text="@string/send_google_maps_url"
style="@android:style/TextAppearance.DeviceDefault.Small" />
</LinearLayout>
<!-- Google Docs result -->
<LinearLayout
android:id="@+id/upload_result_docs_result"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal">
<ImageView
android:id="@+id/upload_result_docs_result_icon"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/success"/>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical">
<TextView
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/send_google_docs"
style="?android:attr/textAppearanceMedium"/>
<TextView
android:id="@+id/upload_result_list_item_url"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/send_google_docs_url"
style="?android:attr/textAppearanceSmall"/>
</LinearLayout>
</LinearLayout>
<!-- Footer -->
<TextView
android:id="@+id/upload_result_success_footer"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/send_google_success_footer"
style="?android:attr/textAppearanceSmall"/>
<TextView
android:id="@+id/upload_result_error_footer"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/send_google_error"
style="?android:attr/textAppearanceLarge"/>
</LinearLayout>
</ScrollView>
</LinearLayout>
<!-- Google Fusion Tables result -->
<LinearLayout
android:id="@+id/upload_result_fusion_tables_result"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="horizontal" >
<ImageView
android:contentDescription="@string/generic_success_title"
android:id="@+id/upload_result_fusion_tables_result_icon"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/success" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="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" />
<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" />
</LinearLayout>
</LinearLayout>
<!-- Google Docs result -->
<LinearLayout
android:id="@+id/upload_result_docs_result"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="horizontal" >
<ImageView
android:contentDescription="@string/generic_success_title"
android:id="@+id/upload_result_docs_result_icon"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/success" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="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" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_docs_url"
style="@android:style/TextAppearance.DeviceDefault.Small" />
</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" />
<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" />
</LinearLayout>
</ScrollView>
MyTracks/res/layout/upload_service_chooser.xml
+71 -83
View File
@@ -14,90 +14,78 @@ 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">
<TextView
android:background="@drawable/list_bar"
android:layout_width="fill_parent" >
<TableLayout
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_width="fill_parent"
android:paddingLeft="10dp"
android:text="@string/send_google_title"
android:textColor="@color/white"
android:textSize="20sp"/>
<ScrollView
android:layout_height="0dp"
android:layout_margin="5dp"
android:layout_weight="1"
android:layout_width="fill_parent">
<TableLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:stretchColumns="1">
<!-- Google Maps -->
<TableRow android:id="@+id/send_google_maps_row">
<ImageView
android:src="@drawable/maps_icon"
style="@style/SendGoogleImageView"/>
<CheckBox
android:id="@+id/send_google_maps"
android:text="@string/send_google_maps"
style="@style/SendGoogleCheckBox"/>
</TableRow>
<TableRow android:id="@+id/send_google_maps_option_row">
<RadioGroup
android:layout_column="1"
android: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" />
<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" />
</TableRow>
<TableRow android:id="@+id/send_google_maps_option_row" >
<RadioGroup
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_width="0dp" >
<RadioButton
android:id="@+id/send_google_new_map"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_width="0dp">
<RadioButton
android:id="@+id/send_google_new_map"
android:text="@string/send_google_new_map"
style="@style/SendGoogleRadioButton"/>
<RadioButton
android:id="@+id/send_google_existing_map"
android:text="@string/send_google_existing_map"
style="@style/SendGoogleRadioButton"/>
</RadioGroup>
</TableRow>
<!-- Google Fusion Tables -->
<TableRow android:id="@+id/send_google_fusion_tables_row">
<ImageView
android:src="@drawable/googledocs_icon"
style="@style/SendGoogleImageView"/>
<CheckBox
android:id="@+id/send_google_fusion_tables"
android:text="@string/send_google_fusion_tables"
style="@style/SendGoogleCheckBox"/>
</TableRow>
<!-- Google Docs -->
<TableRow android:id="@+id/send_google_docs_row">
<ImageView
android:src="@drawable/googledocs_icon"
style="@style/SendGoogleImageView"/>
<CheckBox
android:id="@+id/send_google_docs"
android:text="@string/send_google_docs"
style="@style/SendGoogleCheckBox"/>
</TableRow>
</TableLayout>
</ScrollView>
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button
android:id="@+id/send_google_send_now"
android:layout_gravity="left"
android:text="@string/send_google_send_now"
style="@style/Button"/>
<Button
android:id="@+id/send_google_cancel"
android:layout_gravity="right"
android:text="@string/generic_cancel"
style="@style/Button"/>
<LinearLayout style="@style/ButtonSpacer"/>
</LinearLayout>
</LinearLayout>
android:layout_width="wrap_content"
android:text="@string/send_google_new_map"
style="@android:style/TextAppearance.DeviceDefault.Medium" />
<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" />
</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" />
<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" />
</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" />
<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" />
</TableRow>
</TableLayout>
</ScrollView>
MyTracks/res/layout/welcome.xml
+1
View File
@@ -29,6 +29,7 @@ limitations under the License.
android:layout_width="fill_parent"
android:orientation="vertical">
<ImageView
android:contentDescription="@string/my_tracks_app_name"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:scaleType="fitStart"