forked from upstream-mirrors/OpenTracks
Merge heads
This commit is contained in:
youtaol
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
@@ -0,0 +1,25 @@
|
||||
<?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" >
|
||||
<Button
|
||||
android:id="@+id/marker_edit_cancel"
|
||||
android:text="@string/generic_cancel"
|
||||
style="@style/BottomButton" />
|
||||
<Button
|
||||
android:id="@+id/marker_edit_done"
|
||||
style="@style/BottomButton" />
|
||||
</merge>
|
||||
@@ -0,0 +1,162 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
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="8dp" >
|
||||
<TextView
|
||||
android:id="@+id/marker_detail_name"
|
||||
style="@style/MarkerDetailLabel" />
|
||||
<LinearLayout
|
||||
android:id="@+id/marker_detail_waypoint_section"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="vertical" >
|
||||
<TextView
|
||||
android:id="@+id/marker_detail_marker_type"
|
||||
style="@style/MarkerDetailLabel" />
|
||||
<TextView
|
||||
android:id="@+id/marker_detail_description"
|
||||
style="@style/MarkerDetailLabel" />
|
||||
</LinearLayout>
|
||||
<TableLayout
|
||||
android:id="@+id/marker_detail_statistics_section"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
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>
|
||||
</TableLayout>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
@@ -0,0 +1,86 @@
|
||||
<?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="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"
|
||||
android:padding="8dp" >
|
||||
<LinearLayout
|
||||
android:id="@+id/marker_edit_type_section"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="vertical" >
|
||||
<TextView
|
||||
android:text="@string/marker_edit_type"
|
||||
style="@style/EditLabel" />
|
||||
<RadioGroup
|
||||
android:id="@+id/marker_edit_type"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content" >
|
||||
<RadioButton
|
||||
android:id="@+id/marker_edit_type_statistics"
|
||||
android:text="@string/marker_edit_type_statistics"
|
||||
style="@style/EditLabel" />
|
||||
<RadioButton
|
||||
android:id="@+id/marker_edit_type_waypoint"
|
||||
android:text="@string/marker_edit_type_waypoint"
|
||||
style="@style/EditLabel" />
|
||||
</RadioGroup>
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:text="@string/generic_name"
|
||||
style="@style/EditLabel" />
|
||||
<EditText
|
||||
android:hint="@string/generic_name"
|
||||
android:id="@+id/marker_edit_name"
|
||||
style="@style/EditName" />
|
||||
<LinearLayout
|
||||
android:id="@+id/marker_edit_waypoint_section"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="vertical" >
|
||||
<TextView
|
||||
android:text="@string/marker_edit_marker_type"
|
||||
style="@style/EditLabel" />
|
||||
<AutoCompleteTextView
|
||||
android:hint="@string/marker_edit_marker_type_hint"
|
||||
android:id="@+id/marker_edit_marker_type"
|
||||
android:imeOptions="actionNext"
|
||||
style="@style/EditCategory" />
|
||||
<TextView
|
||||
android:text="@string/generic_description"
|
||||
style="@style/EditLabel" />
|
||||
<EditText
|
||||
android:hint="@string/generic_description"
|
||||
android:id="@+id/marker_edit_description"
|
||||
android:imeOptions="actionDone"
|
||||
style="@style/EditDescription" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
<LinearLayout style="@style/BottomButtonBar" >
|
||||
<include layout="@layout/marker_edit_buttons" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?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" >
|
||||
<Button
|
||||
android:id="@+id/marker_edit_done"
|
||||
style="@style/BottomButton" />
|
||||
<Button
|
||||
android:id="@+id/marker_edit_cancel"
|
||||
android:text="@string/generic_cancel"
|
||||
style="@style/BottomButton" />
|
||||
</merge>
|
||||
@@ -0,0 +1,34 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_width="fill_parent" >
|
||||
<ListView
|
||||
android:id="@+id/marker_list"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_width="fill_parent" />
|
||||
<TextView
|
||||
android:layout_gravity="center"
|
||||
android:gravity="center"
|
||||
android:id="@+id/marker_list_empty"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:paddingBottom="8dp"
|
||||
android:text="@string/marker_list_empty_message"
|
||||
style="@android:style/TextAppearance.DeviceDefault.Large" >
|
||||
</TextView>
|
||||
</FrameLayout>
|
||||
@@ -0,0 +1,41 @@
|
||||
<?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:gravity="center_vertical"
|
||||
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:id="@+id/marker_list_item_name"
|
||||
style="@style/ListItemName" />
|
||||
<TextView
|
||||
android:id="@+id/marker_list_item_category"
|
||||
style="@style/ListItemCategory" />
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:id="@+id/marker_list_item_time"
|
||||
style="@style/ListItemStat" />
|
||||
<TextView
|
||||
android:id="@+id/marker_list_item_description"
|
||||
style="@style/ListItemDescription" />
|
||||
</LinearLayout>
|
||||
@@ -1,61 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||
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:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="vertical" >
|
||||
<TextView
|
||||
android:id="@+id/waypointslist_item_name"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="6dp"
|
||||
android:layout_marginTop="6dp"
|
||||
android:layout_width="fill_parent"
|
||||
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>
|
||||
@@ -1,499 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:background="#c000">
|
||||
<ScrollView
|
||||
android:id="@+id/scrolly"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="fill_parent"
|
||||
android:scrollbarStyle="insideInset">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
<TextView android:text="@string/marker_detail_marker_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
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="4dp"
|
||||
android:paddingRight="2dp"/>
|
||||
<EditText android:id="@+id/waypointdetails_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:inputType="textAutoCorrect|textCapWords"
|
||||
android:selectAllOnFocus="true"
|
||||
android:hint="@string/marker_detail_marker_name"
|
||||
android:imeOptions="actionNext"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout android:id="@+id/waypointdetails_description_layout"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="0dp"
|
||||
android:visibility="visible"
|
||||
android:layout_weight="1">
|
||||
<TextView android:id="@+id/waypointdetails_category_label"
|
||||
android:text="@string/marker_detail_marker_type"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
<AutoCompleteTextView android:id="@+id/waypointdetails_category"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:hint="@string/marker_detail_marker_type_hint"
|
||||
android:imeOptions="actionNext"/>
|
||||
<TextView android:text="@string/marker_detail_marker_description"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
<EditText android:id="@+id/waypointdetails_description"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="0dp"
|
||||
android:singleLine="false"
|
||||
android:inputType="textAutoCorrect|textCapSentences"
|
||||
android:selectAllOnFocus="true"
|
||||
android:minLines="5"
|
||||
android:maxLines="50"
|
||||
android:gravity="top"
|
||||
android:layout_weight="1"
|
||||
android:hint="@string/marker_detail_marker_description"
|
||||
android:imeOptions="actionDone"/>
|
||||
</LinearLayout>
|
||||
|
||||
<TableLayout android:id="@+id/waypoint_stats"
|
||||
android:visibility="gone"
|
||||
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="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
|
||||
android:gravity="right"
|
||||
android:id="@+id/total_distance_register"
|
||||
android:layout_column="1"
|
||||
android:layout_marginBottom="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:text="@string/value_unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="left"
|
||||
android:id="@+id/total_distance_unit_label"
|
||||
android:layout_column="2"
|
||||
android:layout_marginBottom="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:text="@string/unit_mile"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
<!-- 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
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
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="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:text="@string/value_unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<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"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
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="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="-1dp"
|
||||
android:layout_marginTop="-1dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</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:gravity="right"
|
||||
android:id="@+id/total_time_register"
|
||||
android:layout_column="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:layout_span="2"
|
||||
android:layout_width="fill_parent"
|
||||
android:text="@string/value_unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
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="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:text="@string/value_unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<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"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
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="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="-1dp"
|
||||
android:layout_marginTop="-1dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</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:gravity="right"
|
||||
android:id="@+id/moving_time_register"
|
||||
android:layout_column="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_span="2"
|
||||
android:text="@string/value_unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
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="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:text="@string/value_unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<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"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
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="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="-1dp"
|
||||
android:layout_marginTop="-1dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</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:gravity="right"
|
||||
android:id="@+id/elevation_register"
|
||||
android:layout_column="1"
|
||||
android:layout_marginBottom="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:text="@string/value_unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="left"
|
||||
android:id="@+id/elevation_unit_label"
|
||||
android:layout_column="2"
|
||||
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="-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="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:text="@string/value_unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="left"
|
||||
android:id="@+id/elevation_gain_unit_label"
|
||||
android:layout_column="5"
|
||||
android:layout_marginBottom="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:text="@string/unit_feet"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</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:gravity="right"
|
||||
android:id="@+id/min_elevation_register"
|
||||
android:layout_column="1"
|
||||
android:layout_marginBottom="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:text="@string/value_unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="left"
|
||||
android:id="@+id/min_elevation_unit_label"
|
||||
android:layout_column="2"
|
||||
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="-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="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:text="@string/value_unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:id="@+id/max_elevation_unit_label"
|
||||
android:gravity="left"
|
||||
android:layout_column="5"
|
||||
android:layout_marginBottom="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:text="@string/unit_feet"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</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:gravity="right"
|
||||
android:id="@+id/min_grade_register"
|
||||
android:layout_column="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_span="2"
|
||||
android:text="@string/value_unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
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="-9dp"
|
||||
android:layout_marginTop="-9dp"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_span="2"
|
||||
android:text="@string/value_unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
</TableRow>
|
||||
</TableLayout>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
<LinearLayout style="@style/BottomButtonBar" >
|
||||
<Button
|
||||
android:id="@+id/waypointdetails_save"
|
||||
android:text="@string/generic_save"
|
||||
style="@style/BottomButton" />
|
||||
<Button
|
||||
android:id="@+id/waypointdetails_cancel"
|
||||
android:text="@string/generic_cancel"
|
||||
style="@style/BottomButton" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -1,52 +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/waypointslist_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="3dp">
|
||||
<TextView android:id="@+id/message"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="16dp"
|
||||
android:textColor="#fff"
|
||||
android:text="@string/marker_list_pick_one"
|
||||
android:layout_weight="1"/>
|
||||
</LinearLayout>
|
||||
<ListView android:id="@android:id/list"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
<LinearLayout style="@style/BottomButtonBar" >
|
||||
<Button
|
||||
android:id="@+id/waypointslist_btn_insert_statistics"
|
||||
android:text="@string/marker_list_insert_statistics"
|
||||
style="@style/BottomButton" />
|
||||
<Button
|
||||
android:id="@+id/waypointslist_btn_insert_waypoint"
|
||||
android:text="@string/marker_list_insert_waypoint"
|
||||
style="@style/BottomButton" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -28,38 +28,30 @@ limitations under the License.
|
||||
android:orientation="vertical"
|
||||
android:padding="8dp" >
|
||||
<TextView
|
||||
android:text="@string/track_edit_name"
|
||||
style="@style/TrackEditLabelTextView" />
|
||||
android:text="@string/generic_name"
|
||||
style="@style/EditLabel" />
|
||||
<EditText
|
||||
android:drawableLeft="@drawable/track"
|
||||
android:drawablePadding="8dp"
|
||||
android:gravity="center_vertical"
|
||||
android:hint="@string/track_edit_name"
|
||||
android:hint="@string/generic_name"
|
||||
android:id="@+id/track_edit_name"
|
||||
android:imeOptions="actionNext"
|
||||
android:inputType="textAutoCorrect|textCapWords"
|
||||
android:singleLine="true"
|
||||
style="@style/TrackEditValueEditText" />
|
||||
style="@style/EditName" />
|
||||
<TextView
|
||||
android:text="@string/track_edit_activity_type"
|
||||
style="@style/TrackEditLabelTextView" />
|
||||
style="@style/EditLabel" />
|
||||
<AutoCompleteTextView
|
||||
android:hint="@string/track_edit_activity_type_hint"
|
||||
android:id="@+id/track_edit_activity_type"
|
||||
android:imeOptions="actionNext"
|
||||
android:singleLine="true"
|
||||
style="@style/TrackEditValueEditText" />
|
||||
style="@style/EditCategory" />
|
||||
<TextView
|
||||
android:text="@string/track_edit_description"
|
||||
style="@style/TrackEditLabelTextView" />
|
||||
android:text="@string/generic_description"
|
||||
style="@style/EditLabel" />
|
||||
<EditText
|
||||
android:hint="@string/track_edit_description"
|
||||
android:hint="@string/generic_description"
|
||||
android:id="@+id/track_edit_description"
|
||||
android:imeOptions="actionDone"
|
||||
android:inputType="textAutoCorrect|textCapSentences"
|
||||
android:maxLines="50"
|
||||
android:singleLine="false"
|
||||
style="@style/TrackEditValueEditText" />
|
||||
style="@style/EditDescription" />
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
<LinearLayout style="@style/BottomButtonBar" >
|
||||
|
||||
@@ -26,20 +26,11 @@ limitations under the License.
|
||||
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" />
|
||||
style="@style/ListItemName" />
|
||||
<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" />
|
||||
style="@style/ListItemCategory" />
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_height="wrap_content"
|
||||
@@ -47,20 +38,17 @@ limitations under the License.
|
||||
android:orientation="horizontal" >
|
||||
<TextView
|
||||
android:id="@+id/track_list_item_time"
|
||||
style="@style/TrackListItemStatsTextView" />
|
||||
style="@style/ListItemStat" />
|
||||
<TextView
|
||||
android:id="@+id/track_list_item_distance"
|
||||
android:layout_marginLeft="8dp"
|
||||
style="@style/TrackListItemStatsTextView" />
|
||||
style="@style/ListItemStat" />
|
||||
<TextView
|
||||
android:id="@+id/track_list_item_start"
|
||||
android:layout_marginLeft="8dp"
|
||||
style="@style/TrackListItemStatsTextView" />
|
||||
style="@style/ListItemStat" />
|
||||
</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" />
|
||||
style="@style/ListItemDescription" />
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,33 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2012 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||
<item
|
||||
android:icon="@drawable/menu_show_on_map"
|
||||
android:id="@+id/marker_detail_show_on_map"
|
||||
android:showAsAction="always"
|
||||
android:title="@string/menu_show_on_map"/>
|
||||
<item
|
||||
android:icon="@drawable/menu_edit"
|
||||
android:id="@+id/marker_detail_edit"
|
||||
android:showAsAction="always"
|
||||
android:title="@string/menu_edit"/>
|
||||
<item
|
||||
android:icon="@drawable/menu_delete"
|
||||
android:id="@+id/marker_detail_delete"
|
||||
android:showAsAction="ifRoom"
|
||||
android:title="@string/menu_delete"/>
|
||||
</menu>
|
||||
@@ -16,8 +16,14 @@ limitations under the License.
|
||||
-->
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||
<item
|
||||
android:icon="@drawable/menu_search"
|
||||
android:id="@+id/menu_search"
|
||||
android:icon="@drawable/menu_insert_marker"
|
||||
android:id="@+id/marker_list_insert_marker"
|
||||
android:showAsAction="always"
|
||||
android:title="@string/menu_insert_marker"/>
|
||||
<item
|
||||
android:actionViewClass="android.widget.SearchView"
|
||||
android:icon="@drawable/menu_search"
|
||||
android:id="@+id/marker_list_search"
|
||||
android:showAsAction="always|collapseActionView"
|
||||
android:title="@string/menu_search"/>
|
||||
</menu>
|
||||
@@ -0,0 +1,33 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2012 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||
<item
|
||||
android:icon="@drawable/menu_show_on_map"
|
||||
android:id="@+id/marker_list_context_menu_show_on_map"
|
||||
android:showAsAction="always"
|
||||
android:title="@string/menu_show_on_map"/>
|
||||
<item
|
||||
android:icon="@drawable/menu_edit"
|
||||
android:id="@+id/marker_list_context_menu_edit"
|
||||
android:showAsAction="always"
|
||||
android:title="@string/menu_edit"/>
|
||||
<item
|
||||
android:icon="@drawable/menu_delete"
|
||||
android:id="@+id/marker_list_context_menu_delete"
|
||||
android:showAsAction="always"
|
||||
android:title="@string/menu_delete"/>
|
||||
</menu>
|
||||
@@ -662,10 +662,18 @@ limitations under the License.
|
||||
translation_description="The title on a confirmation dialog asking the user if he is sure?">
|
||||
Are you sure?
|
||||
</string>
|
||||
<string name="generic_description"
|
||||
translation_description="The text label for entering a description.">
|
||||
Description
|
||||
</string>
|
||||
<string name="generic_error_title"
|
||||
translation_description="The title on an alert dialog indicating error.">
|
||||
Error
|
||||
</string>
|
||||
<string name="generic_name"
|
||||
translation_description="The text label for entering a name.">
|
||||
Name
|
||||
</string>
|
||||
<string name="generic_ok"
|
||||
translation_description="The text on a button to say ok.">
|
||||
OK
|
||||
@@ -682,7 +690,7 @@ limitations under the License.
|
||||
translation_description="The title on an alert dialog indicating success.">
|
||||
Success
|
||||
</string>
|
||||
|
||||
|
||||
<!-- GPS -->
|
||||
<string name="gps_need_to_enable"
|
||||
translation_description="In the main view, the message on the top asking the user to enable
|
||||
@@ -948,44 +956,67 @@ limitations under the License.
|
||||
</string>
|
||||
|
||||
<!-- Marker -->
|
||||
<string name="marker_detail_marker_description"
|
||||
translation_description="In the detail page for a waypoint marker, the text field for the marker
|
||||
description.">
|
||||
Marker description
|
||||
</string>
|
||||
<string name="marker_detail_marker_name"
|
||||
translation_description="In the detail page for a waypoint or statistics marker, text field for
|
||||
the marker name.">
|
||||
Marker name
|
||||
<string name="marker_delete_one_marker_confirm_message"
|
||||
translation_description="When deleting a marker, the confirmation dialog message informing the
|
||||
user that the marker will be permanently deleted from the phone.">
|
||||
The marker will be permanently deleted from the phone.
|
||||
</string>
|
||||
<string name="marker_detail_description"
|
||||
translation_description="In the marker detail page, the label for the description.
|
||||
|
||||
%1$s marker description. E.g., 'At the top'.">
|
||||
Description: %1$s
|
||||
</string>
|
||||
<string name="marker_detail_marker_type"
|
||||
translation_description="In the detail page for a waypoint marker, the text field for the
|
||||
marker type, including examples.">
|
||||
Marker type (e.g. building, pothole, sight...)
|
||||
translation_description="In the marker detail page, the label for the marker type.
|
||||
|
||||
%1$s marker type. E.g., 'building'.">
|
||||
Marker type: %1$s
|
||||
</string>
|
||||
<string name="marker_detail_name"
|
||||
translation_description="In the marker detail page, the label for the marker name.
|
||||
|
||||
%1$s marker name. E.g., 'Waypoint1'.">
|
||||
Name: %1$s
|
||||
</string>
|
||||
<string name="marker_edit_add"
|
||||
translation_description="The label on the button to add a marker.">
|
||||
Add
|
||||
</string>
|
||||
<string name="marker_detail_marker_type_hint"
|
||||
translation_description="In the detail page for a waypoint marker, the hint in the 'Marker type'
|
||||
text field when it is empty.">
|
||||
Marker type
|
||||
<string name="marker_edit_add_error"
|
||||
translation_description="When adding a marker, the message indicating error.">
|
||||
Unable to insert a marker. Try again.
|
||||
</string>
|
||||
<string name="marker_detail_title"
|
||||
translation_description="In the detail page for a waypoint or statistics marker, the title of
|
||||
the page.">
|
||||
Marker details
|
||||
</string>
|
||||
<string name="marker_icon_description"
|
||||
translation_description="The accessibility description for the marker icon.">
|
||||
Marker
|
||||
</string>
|
||||
<string name="marker_insert_error"
|
||||
translation_description="When inserting a marker, message when not able to insert due to no GPS
|
||||
location and asking the user to try again.">
|
||||
Unable to insert a marker. No GPS location. Try again.
|
||||
</string>
|
||||
<string name="marker_insert_success"
|
||||
translation_description="When inserting a new marker, a message indicating success.">
|
||||
<string name="marker_edit_add_success"
|
||||
translation_description="When adding a marker, the message indicating success.">
|
||||
A marker was inserted.
|
||||
</string>
|
||||
<string name="marker_edit_add_title"
|
||||
translation_description="The title of the page to add a new marker.">
|
||||
New Marker
|
||||
</string>
|
||||
<string name="marker_edit_marker_type"
|
||||
translation_description="The label for the text field to edit the marker type, including some
|
||||
exmaples.">
|
||||
Marker type (e.g. building, pothole...)
|
||||
</string>
|
||||
<string name="marker_edit_marker_type_hint"
|
||||
translation_description="The hint in the 'Marker type' text field when it is empty.">
|
||||
Marker type
|
||||
</string>
|
||||
<string name="marker_edit_type"
|
||||
translation_description="When adding a marker, the label to select a type, statistics or
|
||||
waypoint.">
|
||||
Type
|
||||
</string>
|
||||
<string name="marker_edit_type_statistics"
|
||||
translation_description="The label to add a statistics marker.">
|
||||
Statistics
|
||||
</string>
|
||||
<string name="marker_edit_type_waypoint"
|
||||
translation_description="The label to add a waypoint marker.">
|
||||
Waypoint
|
||||
</string>
|
||||
<string name="marker_label_end"
|
||||
translation_description="When inserting a marker to indicate the end of a track, the marker's
|
||||
name. E.g., 'track_name (End)'.
|
||||
@@ -1000,54 +1031,9 @@ limitations under the License.
|
||||
%1$s track name. E.g., 'track_name'.">
|
||||
%1$s (Start)
|
||||
</string>
|
||||
<string name="marker_list_context_menu_title"
|
||||
translation_description="In the context menu for a marker, the title indicating that all the
|
||||
menu options below are for this marker.">
|
||||
This marker
|
||||
</string>
|
||||
<string name="marker_list_delete_marker"
|
||||
translation_description="In the context menu for a marker, the menu option to delete the
|
||||
marker.">
|
||||
Delete
|
||||
</string>
|
||||
<string name="marker_list_delete_marker_confirm_message"
|
||||
translation_description="In the context menu for a marker, when pressing the 'Delete' option,
|
||||
the confirmation dialog message informing the user that the marker will be permanently
|
||||
deleted from the phone.">
|
||||
The marker will be permanently deleted from the phone.
|
||||
</string>
|
||||
<string name="marker_list_edit_marker"
|
||||
translation_description="In the context menu for a marker, the menu option to edit the marker's
|
||||
metadata (e.g., name, type, etc.).">
|
||||
Edit
|
||||
</string>
|
||||
<string name="marker_list_insert_statistics"
|
||||
translation_description="In the Markers page, the button on the bottom to insert a statistics
|
||||
marker.">
|
||||
Insert statistics
|
||||
</string>
|
||||
<string name="marker_list_insert_waypoint"
|
||||
translation_description="In the Markers page, the button on the bottom to insert a waypoint
|
||||
marker.">
|
||||
Insert waypoint
|
||||
</string>
|
||||
<string name="marker_list_pick_one"
|
||||
translation_description="In the Markers page, the instruction at the top of the page informing
|
||||
the user he can press and hold a marker for more options.">
|
||||
Pick a marker. Press & hold for more options.
|
||||
</string>
|
||||
<string name="marker_list_show_on_map"
|
||||
translation_description="In the context menu for a marker, the menu option to show the marker
|
||||
on the map.">
|
||||
Show on map
|
||||
</string>
|
||||
<string name="marker_type_statistics"
|
||||
translation_description="When inserting a statistics marker, the default name of the marker.">
|
||||
Statistics
|
||||
</string>
|
||||
<string name="marker_type_waypoint"
|
||||
translation_description="When inserting a waypoint marker, the default name of the marker.">
|
||||
Waypoint
|
||||
<string name="marker_list_empty_message"
|
||||
translation_description="The message when the marker list is empty.">
|
||||
You don\'t have any markers.
|
||||
</string>
|
||||
|
||||
<!-- Menu Items -->
|
||||
@@ -1147,6 +1133,10 @@ limitations under the License.
|
||||
translation_description="In the menu, to go to the settings page.">
|
||||
Settings
|
||||
</string>
|
||||
<string name="menu_show_on_map"
|
||||
translation_description="In the menu, to show a marker on map.">
|
||||
Show on map
|
||||
</string>
|
||||
<string name="menu_stop_recording"
|
||||
translation_description="In the menu, to stop recording a track.">
|
||||
Stop recording
|
||||
@@ -1428,14 +1418,6 @@ limitations under the License.
|
||||
sensor. E.g, 'Battery level: 50 %'.">
|
||||
Battery level
|
||||
</string>
|
||||
<string name="sensor_state_battery_value"
|
||||
translation_description="In the 'Sensor state' page, the value for the 'Battery level'. E.g,
|
||||
'Battery level: 50 %'.
|
||||
|
||||
%1$d: a number. E.g., '50'.
|
||||
%%: escape sequence for the '%' character.">
|
||||
%1$d %%
|
||||
</string>
|
||||
<string name="sensor_state_cadence"
|
||||
translation_description="In the 'Sensor state' page, the label for the cadence on the bike
|
||||
sensor. Cadence is the number of revolutions of the crank per minute. E.g.,
|
||||
@@ -2202,16 +2184,6 @@ limitations under the License.
|
||||
when it is empty.">
|
||||
Activity type
|
||||
</string>
|
||||
<string name="track_edit_description"
|
||||
translation_description="In the page to edit a track, the label for the text field to edit the
|
||||
track description.">
|
||||
Description
|
||||
</string>
|
||||
<string name="track_edit_name"
|
||||
translation_description="In the page to edit a track, the label for the text field to edit the
|
||||
track name.">
|
||||
Name
|
||||
</string>
|
||||
<string name="track_edit_new_track_title"
|
||||
translation_description="The title of the track edit page when saving a new track.">
|
||||
New Track
|
||||
@@ -2420,6 +2392,12 @@ limitations under the License.
|
||||
%1$d: an integer value. E.g., '2'">
|
||||
%1$d min
|
||||
</string>
|
||||
<string name="value_integer_percent"
|
||||
translation_description="To display a value in percent like 2 %.
|
||||
|
||||
%1$d: an integer value. E.g., '2'">
|
||||
%1$d %%
|
||||
</string>
|
||||
<string name="value_integer_second"
|
||||
translation_description="In a setting picker, the string format to display an integer value in
|
||||
seconds (s).
|
||||
|
||||
@@ -28,8 +28,92 @@ limitations under the License.
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
<item name="android:layout_width">0dp</item>
|
||||
</style>
|
||||
<!-- The style for the edit category -->
|
||||
<style name="EditCategory" parent="@android:style/TextAppearance.DeviceDefault.Medium">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:selectAllOnFocus">true</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
</style>
|
||||
|
||||
<!-- The style for the edit description -->
|
||||
<style name="EditDescription" parent="@android:style/TextAppearance.DeviceDefault.Medium">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:selectAllOnFocus">true</item>
|
||||
<item name="android:singleLine">false</item>
|
||||
<item name="android:maxLines">50</item>
|
||||
<item name="android:inputType">textAutoCorrect|textCapSentences</item>
|
||||
</style>
|
||||
<!-- The style for the edit label -->
|
||||
<style name="EditLabel" parent="@android:style/TextAppearance.DeviceDefault.Medium">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
</style>
|
||||
<!-- The style for the edit name -->
|
||||
<style name="EditName" parent="@android:style/TextAppearance.DeviceDefault.Medium">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:selectAllOnFocus">true</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
<item name="android:inputType">textAutoCorrect|textCapWords</item>
|
||||
<item name="android:drawablePadding">8dp</item>
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
</style>
|
||||
<!-- The style for the list item category -->
|
||||
<style name="ListItemCategory" parent="@android:style/TextAppearance.DeviceDefault.Small">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
<item name="android:layout_marginLeft">8dp</item>
|
||||
</style>
|
||||
<!-- The style for the list item description -->
|
||||
<style name="ListItemDescription" parent="@android:style/TextAppearance.DeviceDefault.Small">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:singleLine">false</item>
|
||||
</style>
|
||||
<!-- The style for the list item name -->
|
||||
<style name="ListItemName" parent="@android:style/TextAppearance.DeviceDefault.Large">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
<item name="android:paddingLeft">9dp</item>
|
||||
</style>
|
||||
<!-- style for the list item stat -->
|
||||
<style name="ListItemStat" parent="@android:style/TextAppearance.DeviceDefault.Small">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
<item name="android:textColor">@color/green</item>
|
||||
</style>
|
||||
<!-- The style for the marker detail label -->
|
||||
<style name="MarkerDetailLabel" parent="@android:style/TextAppearance.DeviceDefault.Large">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
</style>
|
||||
<!-- The style for the marker detail statistics label -->
|
||||
<style name="MarkerDetailStatisticsLabel" parent="@android:style/TextAppearance.DeviceDefault.Medium">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">0dp</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
</style>
|
||||
<!-- The style for the marker detail statistics spacer -->
|
||||
<style name="MarkerDetailStatisticsSpacer">
|
||||
<item name="android:layout_height">fill_parent</item>
|
||||
<item name="android:layout_width">8dp</item>
|
||||
</style>
|
||||
<!-- The style for the marker detail statistics value -->
|
||||
<style name="MarkerDetailStatisticsValue" parent="@android:style/TextAppearance.DeviceDefault.Large">
|
||||
<item name="android:gravity">right</item>
|
||||
<item name="android:textColor">@color/stat_label_text</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">0dp</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
<item name="android:background">@android:color/background_light</item>
|
||||
</style>
|
||||
|
||||
<style name="SensorStateLabel">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
@@ -107,34 +191,14 @@ limitations under the License.
|
||||
<item name="android:layout_marginTop">-9dp</item>
|
||||
<item name="android:textColor">@color/stat_label_text</item>
|
||||
</style>
|
||||
|
||||
<!-- The style for the label in track_edit.xml -->
|
||||
<style name="TrackEditLabelTextView" parent="@android:style/TextAppearance.DeviceDefault.Medium">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
</style>
|
||||
<!-- The style for the value in track_edit.xml -->
|
||||
<style name="TrackEditValueEditText" parent="@android:style/TextAppearance.DeviceDefault.Medium">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:selectAllOnFocus">true</item>
|
||||
</style>
|
||||
|
||||
<!-- The style for the stats in track_list_item.xml -->
|
||||
<style name="TrackListItemStatsTextView" parent="@android:style/TextAppearance.DeviceDefault.Small">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
<item name="android:textColor">@color/green</item>
|
||||
</style>
|
||||
|
||||
<!-- The style for the answer in welcome.xml -->
|
||||
|
||||
<!-- The style for the welcome page answer -->
|
||||
<style name="WelcomeAnswerTextView" parent="@android:style/TextAppearance.DeviceDefault.Small">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:paddingBottom">8dp</item>
|
||||
</style>
|
||||
<!-- The style for the question in welcome.xml -->
|
||||
<!-- The style for welcome page question -->
|
||||
<style name="WelcomeQuestionTextView" parent="@android:style/TextAppearance.DeviceDefault.Medium">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
|
||||
Reference in New Issue
Block a user