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

Clean up all the layouts.

Browse Source 
Utilize styles when possible.
This commit is contained in:
Jimmy Shih
2012-04-20 17:46:48 -07:00
parent eb3e7e0b86
commit 7701d31bdc
28 changed files with 340 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/drawable/list_bar.xml
-19
View File
@@ -1,19 +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.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<gradient android:startColor="#ff999999" android:endColor="#ff777777" android:angle="270"/>
</shape>
MyTracks/res/layout/about.xml
+14 -43
View File
@@ -15,64 +15,35 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent" style="@style/ScrollView" >
android:layout_width="fill_parent" >
<LinearLayout <LinearLayout
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:orientation="vertical" android:orientation="vertical"
android:padding="8dp" > android:padding="8dp" >
<TextView <TextView
android:drawableLeft="@drawable/arrow_icon" android:drawableLeft="@drawable/arrow_icon"
android:drawablePadding="8dp" android:text="@string/about_copyright_notice"
android:gravity="center" style="@style/TextMedium.WithIcon" />
android:layout_height="wrap_content"
android:layout_width="wrap_content"
style="@android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/about_copyright_notice" />
<TextView <TextView
android:layout_height="wrap_content" android:text="@string/about_version"
android:layout_width="wrap_content" style="@style/TextLarge" />
style="@android:style/TextAppearance.DeviceDefault.Large"
android:text="@string/about_version" />
<TextView <TextView
android:id="@+id/about_version" android:id="@+id/about_version"
android:layout_height="wrap_content" style="@style/AboutValue" />
android:layout_width="wrap_content"
android:paddingLeft="48dp"
style="@android:style/TextAppearance.DeviceDefault.Medium" />
<TextView <TextView
android:layout_height="wrap_content" android:text="@string/about_support"
android:layout_width="wrap_content" style="@style/TextLarge" />
style="@android:style/TextAppearance.DeviceDefault.Large"
android:text="@string/about_support" />
<TextView <TextView
android:autoLink="web" android:autoLink="web"
android:layout_height="wrap_content" android:text="@string/my_tracks_support_url"
android:layout_width="wrap_content" style="@style/AboutValue" />
android:paddingLeft="48dp"
style="@android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/my_tracks_support_url" />
<TextView <TextView
android:layout_height="wrap_content" android:text="@string/about_privacy"
android:layout_width="wrap_content" style="@style/TextLarge" />
style="@android:style/TextAppearance.DeviceDefault.Large"
android:text="@string/about_privacy" />
<TextView <TextView
android:autoLink="web" android:autoLink="web"
android:layout_height="wrap_content" android:text="@string/my_tracks_privacy_url"
android:layout_width="wrap_content" style="@style/AboutValue" />
android:paddingLeft="48dp"
style="@android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/my_tracks_privacy_url" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
MyTracks/res/layout/chart.xml
+35
View File
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2010 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/chart_view_layout"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="fill_parent"
android:orientation="vertical" >
</LinearLayout>
<ZoomControls
android:background="@android:color/white"
android:gravity="right"
android:id="@+id/chart_zoom_controls"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:paddingRight="8dp" />
</LinearLayout>
MyTracks/res/layout/chart_settings.xml
+19 -54
View File
@@ -15,87 +15,52 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent" style="@style/ScrollView" >
android:layout_width="fill_parent" >
<LinearLayout <LinearLayout
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:orientation="vertical" android:orientation="vertical"
android:padding="8dp" > android:padding="8dp" >
<TextView <TextView
android:drawableLeft="@drawable/x_axis" android:drawableLeft="@drawable/x_axis"
android:drawablePadding="8dp" android:text="@string/chart_settings_x_axis"
android:gravity="bottom" style="@style/TextLarge.WithIcon" />
android:layout_height="wrap_content"
android:layout_width="wrap_content"
style="@android:style/TextAppearance.DeviceDefault.Large"
android:text="@string/chart_settings_x_axis" />
<RadioGroup <RadioGroup
android:id="@+id/chart_settings_x" android:id="@+id/chart_settings_x"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" > android:layout_width="wrap_content" >
<RadioButton <RadioButton
android:id="@+id/chart_settings_by_distance" android:id="@+id/chart_settings_by_distance"
android:layout_height="wrap_content" android:text="@string/chart_settings_by_distance"
android:layout_width="wrap_content" style="@style/TextMedium" />
style="@android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/chart_settings_by_distance" />
<RadioButton <RadioButton
android:id="@+id/chart_settings_by_time" android:id="@+id/chart_settings_by_time"
android:layout_height="wrap_content" android:text="@string/chart_settings_by_time"
android:layout_width="wrap_content" style="@style/TextMedium" />
style="@android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/chart_settings_by_time" />
</RadioGroup> </RadioGroup>
<TextView <TextView
android:drawableLeft="@drawable/y_axis" android:drawableLeft="@drawable/y_axis"
android:drawablePadding="8dp" android:text="@string/chart_settings_y_axis"
android:gravity="bottom" style="@style/TextLarge.WithIcon" />
android:layout_height="wrap_content"
android:layout_width="wrap_content"
style="@android:style/TextAppearance.DeviceDefault.Large"
android:text="@string/chart_settings_y_axis" />
<CheckBox <CheckBox
android:id="@+id/chart_settings_elevation" android:id="@+id/chart_settings_elevation"
android:layout_height="wrap_content" android:text="@string/stats_elevation"
android:layout_width="wrap_content" style="@style/TextMedium" />
style="@android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/stat_elevation" />
<CheckBox <CheckBox
android:id="@+id/chart_settings_speed" android:id="@+id/chart_settings_speed"
android:layout_height="wrap_content" android:text="@string/stats_speed"
android:layout_width="wrap_content" style="@style/TextMedium" />
style="@android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/stat_speed" />
<CheckBox <CheckBox
android:id="@+id/chart_settings_power" android:id="@+id/chart_settings_power"
android:layout_height="wrap_content" android:text="@string/sensor_state_power"
android:layout_width="wrap_content" style="@style/TextMedium" />
style="@android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/sensor_state_power" />
<CheckBox <CheckBox
android:id="@+id/chart_settings_cadence" android:id="@+id/chart_settings_cadence"
android:layout_height="wrap_content" android:text="@string/sensor_state_cadence"
android:layout_width="wrap_content" style="@style/TextMedium" />
style="@android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/sensor_state_cadence" />
<CheckBox <CheckBox
android:id="@+id/chart_settings_heart_rate" android:id="@+id/chart_settings_heart_rate"
android:layout_height="wrap_content" android:text="@string/sensor_state_heart_rate"
android:layout_width="wrap_content" style="@style/TextMedium" />
style="@android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/sensor_state_heart_rate" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
MyTracks/res/layout/choose_map.xml
+6 -23
View File
@@ -14,32 +14,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent" android:layout_width="fill_parent" >
android:orientation="vertical">
<TextView
android:background="@drawable/list_bar"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:padding="5dp"
android:text="@string/maps_list_pick_map"
android:textColor="@color/white"
android:textSize="16sp"/>
<ListView <ListView
android:id="@+id/choose_map_list_view" android:id="@+id/choose_map_list_view"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="1" android:layout_width="fill_parent" />
android:layout_width="fill_parent"
android:padding="5dp"/>
<TextView <TextView
android:id="@+id/choose_map_empty_view" android:id="@+id/choose_map_empty_view"
android:gravity="center" style="@style/ListEmptyTextView" >
android:layout_height="fill_parent" </TextView>
android:layout_weight="1" </merge>
android:layout_width="fill_parent"
android:padding="5dp"
android:textColor="@color/red"
android:textSize="16sp"
android:textStyle="bold"/>
</LinearLayout>
MyTracks/res/layout/choose_map_item.xml
+13 -23
View File
@@ -15,33 +15,23 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:gravity="center_vertical"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="2dp" android:padding="8dp" >
android:paddingTop="2dp">
<TextView <TextView
android:id="@+id/choose_map_list_item_title" android:id="@+id/choose_map_item_title"
android:layout_height="wrap_content" android:singleLine="true"
android:layout_marginLeft="6dp" style="@style/TextLarge" />
android:layout_marginTop="6dp"
android:layout_width="fill_parent"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold"
android:singleLine="true"/>
<TextView <TextView
android:id="@+id/choose_map_list_item_description" android:id="@+id/choose_map_item_description"
android:layout_height="wrap_content" android:singleLine="false"
android:layout_marginLeft="6dp" android:textColor="@android:color/secondary_text_dark"
android:layout_width="fill_parent" style="@style/TextSmall" />
android:textSize="14sp"
android:singleLine="true"/>
<TextView <TextView
android:id="@+id/choose_map_list_item_search_status" android:id="@+id/choose_map_item_search_status"
android:layout_height="wrap_content" android:singleLine="true"
android:layout_marginLeft="6dp" style="@style/TextSmall" />
android:layout_width="fill_parent"
android:textSize="14sp"
android:singleLine="true"/>
</LinearLayout> </LinearLayout>
MyTracks/res/layout/help.xml
+2 -5
View File
@@ -18,11 +18,8 @@ limitations under the License.
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:orientation="vertical" > android:orientation="vertical" >
<ScrollView <ScrollView style="@style/ScrollView.WithBottomButtons" >
android:layout_height="0dp" <include layout="@layout/help_content" />
android:layout_weight="1"
android:layout_width="fill_parent" >
<include layout="@layout/welcome" />
</ScrollView> </ScrollView>
<LinearLayout style="@style/BottomButtonBar" > <LinearLayout style="@style/BottomButtonBar" >
<include layout="@layout/help_buttons" /> <include layout="@layout/help_buttons" />
MyTracks/res/layout/list_item.xml
+8 -3
View File
@@ -27,10 +27,13 @@ limitations under the License.
android:orientation="horizontal" > android:orientation="horizontal" >
<TextView <TextView
android:id="@+id/list_item_name" android:id="@+id/list_item_name"
style="@style/ListItemName" /> android:singleLine="true"
style="@style/TextLarge.WithIcon" />
<TextView <TextView
android:id="@+id/list_item_category" android:id="@+id/list_item_category"
style="@style/ListItemCategory" /> android:layout_marginLeft="8dp"
android:singleLine="true"
style="@style/TextSmall" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -50,5 +53,7 @@ limitations under the License.
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/list_item_description" android:id="@+id/list_item_description"
style="@style/ListItemDescription" /> android:singleLine="false"
android:textColor="@android:color/secondary_text_dark"
style="@style/TextSmall" />
</LinearLayout> </LinearLayout>
MyTracks/res/layout/map.xml
+37
View File
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2010 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent"
android:layout_width="fill_parent" >
<!-- apiKey corresponds to certificate md5: 81:DF:A2:63:53:C7:6B:1E:6C:24:62:D4:91:1C:36:3A -->
<com.google.android.maps.MapView
android:apiKey="0TXoRmxTinrZKQ9JSazj-9A34XX6_lXsRvTpXWA"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:id="@+id/map_view"
android:layout_height="fill_parent"
android:layout_width="fill_parent" />
<TextView
android:background="@android:color/darker_gray"
android:id="@+id/map_message"
android:layout_alignParentTop="true"
android:layout_width="fill_parent"
android:padding="8dp"
android:visibility="gone"
style="@style/TextMedium" />
</RelativeLayout>
MyTracks/res/layout/marker_detail.xml
+4 -4
View File
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/ScrollView"> style="@style/ScrollView" >
<LinearLayout <LinearLayout
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
@@ -23,7 +23,7 @@ limitations under the License.
android:padding="8dp" > android:padding="8dp" >
<TextView <TextView
android:id="@+id/marker_detail_name" android:id="@+id/marker_detail_name"
style="@style/MarkerDetailLabel" /> style="@style/TextLarge" />
<LinearLayout <LinearLayout
android:id="@+id/marker_detail_waypoint_section" android:id="@+id/marker_detail_waypoint_section"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -31,10 +31,10 @@ limitations under the License.
android:orientation="vertical" > android:orientation="vertical" >
<TextView <TextView
android:id="@+id/marker_detail_marker_type" android:id="@+id/marker_detail_marker_type"
style="@style/MarkerDetailLabel" /> style="@style/TextLarge" />
<TextView <TextView
android:id="@+id/marker_detail_description" android:id="@+id/marker_detail_description"
style="@style/MarkerDetailLabel" /> style="@style/TextLarge" />
</LinearLayout> </LinearLayout>
<TableLayout <TableLayout
android:id="@+id/marker_detail_statistics_section" android:id="@+id/marker_detail_statistics_section"
MyTracks/res/layout/marker_edit.xml
+7 -10
View File
@@ -18,10 +18,7 @@ limitations under the License.
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:orientation="vertical" > android:orientation="vertical" >
<ScrollView <ScrollView style="@style/ScrollView.WithBottomButtons" >
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="fill_parent" >
<LinearLayout <LinearLayout
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
@@ -34,7 +31,7 @@ limitations under the License.
android:orientation="vertical" > android:orientation="vertical" >
<TextView <TextView
android:text="@string/marker_edit_type" android:text="@string/marker_edit_type"
style="@style/EditLabel" /> style="@style/TextMedium" />
<RadioGroup <RadioGroup
android:id="@+id/marker_edit_type" android:id="@+id/marker_edit_type"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -42,16 +39,16 @@ limitations under the License.
<RadioButton <RadioButton
android:id="@+id/marker_edit_type_statistics" android:id="@+id/marker_edit_type_statistics"
android:text="@string/marker_edit_type_statistics" android:text="@string/marker_edit_type_statistics"
style="@style/EditLabel" /> style="@style/TextMedium" />
<RadioButton <RadioButton
android:id="@+id/marker_edit_type_waypoint" android:id="@+id/marker_edit_type_waypoint"
android:text="@string/marker_edit_type_waypoint" android:text="@string/marker_edit_type_waypoint"
style="@style/EditLabel" /> style="@style/TextMedium" />
</RadioGroup> </RadioGroup>
</LinearLayout> </LinearLayout>
<TextView <TextView
android:text="@string/generic_name" android:text="@string/generic_name"
style="@style/EditLabel" /> style="@style/TextMedium" />
<EditText <EditText
android:hint="@string/generic_name" android:hint="@string/generic_name"
android:id="@+id/marker_edit_name" android:id="@+id/marker_edit_name"
@@ -63,7 +60,7 @@ limitations under the License.
android:orientation="vertical" > android:orientation="vertical" >
<TextView <TextView
android:text="@string/marker_edit_marker_type" android:text="@string/marker_edit_marker_type"
style="@style/EditLabel" /> style="@style/TextMedium" />
<AutoCompleteTextView <AutoCompleteTextView
android:hint="@string/marker_edit_marker_type_hint" android:hint="@string/marker_edit_marker_type_hint"
android:id="@+id/marker_edit_marker_type" android:id="@+id/marker_edit_marker_type"
@@ -71,7 +68,7 @@ limitations under the License.
style="@style/EditCategory" /> style="@style/EditCategory" />
<TextView <TextView
android:text="@string/generic_description" android:text="@string/generic_description"
style="@style/EditLabel" /> style="@style/TextMedium" />
<EditText <EditText
android:hint="@string/generic_description" android:hint="@string/generic_description"
android:id="@+id/marker_edit_description" android:id="@+id/marker_edit_description"
MyTracks/res/layout/marker_list.xml
+2 -2
View File
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent" > android:layout_width="fill_parent" >
<ListView <ListView
@@ -26,4 +26,4 @@ limitations under the License.
android:text="@string/marker_list_empty_message" android:text="@string/marker_list_empty_message"
style="@style/ListEmptyTextView" > style="@style/ListEmptyTextView" >
</TextView> </TextView>
</FrameLayout> </merge>
MyTracks/res/layout/mytracks_charts.xml
-57
View File
@@ -1,57 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2010 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/elevation_root"
android:orientation="vertical"
android:layout_height="fill_parent"
android:layout_width="fill_parent">
<LinearLayout android:id="@+id/elevation_chart"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
</LinearLayout>
<RelativeLayout android:id="@+id/elevation_zoom_layout"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="10dp">
<ZoomControls android:id="@+id/elevation_zoom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_alignParentRight="true"/>
</RelativeLayout>
<LinearLayout android:id="@+id/elevation_busypane"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="3dp"
android:visibility="gone">
<ProgressBar
android:layout_weight="1"
android:layout_height="0dp"
android:layout_width="wrap_content"
android:maxWidth="80dp"
android:maxHeight="80dp"
android:minWidth="80dp"
android:minHeight="80dp"
android:layout_gravity="center"/>
</LinearLayout>
</RelativeLayout>
MyTracks/res/layout/mytracks_layout.xml
-62
View File
@@ -1,62 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2010 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/screen"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<com.google.android.maps.MapView android:id="@+id/map"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:clickable="true"
android:enabled="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:apiKey="0TXoRmxTinrZKQ9JSazj-9A34XX6_lXsRvTpXWA"/>
<!-- corresponding certificate md5: 81:DF:A2:63:53:C7:6B:1E:6C:24:62:D4:91:1C:36:3A -->
<LinearLayout android:id="@+id/messagepane"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_bar"
android:padding="3dp"
android:visibility="gone">
<TextView android:id="@+id/messagetext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="16dp"
android:textColor="#fff"
android:text="@string/gps_wait_for_fix"
android:layout_weight="1"/>
</LinearLayout>
<LinearLayout android:id="@+id/busypane"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="3dp"
android:visibility="gone">
<ProgressBar
android:layout_weight="1"
android:layout_height="0dp"
android:layout_width="wrap_content"
android:maxWidth="80dp"
android:maxHeight="80dp"
android:minWidth="80dp"
android:minHeight="80dp"
android:layout_gravity="center"/>
</LinearLayout>
</RelativeLayout>
MyTracks/res/layout/search_list.xml
+2 -2
View File
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent" > android:layout_width="fill_parent" >
<ListView <ListView
@@ -26,4 +26,4 @@ limitations under the License.
android:text="@string/search_list_empty_message" android:text="@string/search_list_empty_message"
style="@style/ListEmptyTextView" > style="@style/ListEmptyTextView" >
</TextView> </TextView>
</FrameLayout> </merge>
MyTracks/res/layout/sensor_state.xml
+6 -6
View File
@@ -23,42 +23,42 @@ limitations under the License.
android:padding="8dp" > android:padding="8dp" >
<TextView <TextView
android:text="@string/menu_sensor_state" android:text="@string/menu_sensor_state"
style="@style/SensorStateLabel" /> style="@style/TextMedium" />
<TextView <TextView
android:id="@+id/sensor_state" android:id="@+id/sensor_state"
style="@style/SensorStateValue" /> style="@style/SensorStateValue" />
<!-- Last sensor time --> <!-- Last sensor time -->
<TextView <TextView
android:text="@string/sensor_state_last_sensor_time" android:text="@string/sensor_state_last_sensor_time"
style="@style/SensorStateLabel" /> style="@style/TextMedium" />
<TextView <TextView
android:id="@+id/sensor_state_last_sensor_time" android:id="@+id/sensor_state_last_sensor_time"
style="@style/SensorStateValue" /> style="@style/SensorStateValue" />
<!-- Power --> <!-- Power -->
<TextView <TextView
android:text="@string/sensor_state_power" android:text="@string/sensor_state_power"
style="@style/SensorStateLabel" /> style="@style/TextMedium" />
<TextView <TextView
android:id="@+id/sensor_state_power" android:id="@+id/sensor_state_power"
style="@style/SensorStateValue" /> style="@style/SensorStateValue" />
<!-- Cadence --> <!-- Cadence -->
<TextView <TextView
android:text="@string/sensor_state_cadence" android:text="@string/sensor_state_cadence"
style="@style/SensorStateLabel" /> style="@style/TextMedium" />
<TextView <TextView
android:id="@+id/sensor_state_cadence" android:id="@+id/sensor_state_cadence"
style="@style/SensorStateValue" /> style="@style/SensorStateValue" />
<!-- Heart rate --> <!-- Heart rate -->
<TextView <TextView
android:text="@string/sensor_state_heart_rate" android:text="@string/sensor_state_heart_rate"
style="@style/SensorStateLabel" /> style="@style/TextMedium" />
<TextView <TextView
android:id="@+id/sensor_state_heart_rate" android:id="@+id/sensor_state_heart_rate"
style="@style/SensorStateValue" /> style="@style/SensorStateValue" />
<!-- Battery level --> <!-- Battery level -->
<TextView <TextView
android:text="@string/sensor_state_battery" android:text="@string/sensor_state_battery"
style="@style/SensorStateLabel" /> style="@style/TextMedium" />
<TextView <TextView
android:id="@+id/sensor_state_battery" android:id="@+id/sensor_state_battery"
style="@style/SensorStateValue" /> style="@style/SensorStateValue" />
MyTracks/res/layout/track_edit.xml
+4 -7
View File
@@ -18,10 +18,7 @@ limitations under the License.
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:orientation="vertical" > android:orientation="vertical" >
<ScrollView <ScrollView style="@style/ScrollView.WithBottomButtons" >
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="fill_parent" >
<LinearLayout <LinearLayout
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
@@ -29,7 +26,7 @@ limitations under the License.
android:padding="8dp" > android:padding="8dp" >
<TextView <TextView
android:text="@string/generic_name" android:text="@string/generic_name"
style="@style/EditLabel" /> style="@style/TextMedium" />
<EditText <EditText
android:drawableLeft="@drawable/track" android:drawableLeft="@drawable/track"
android:hint="@string/generic_name" android:hint="@string/generic_name"
@@ -38,7 +35,7 @@ limitations under the License.
style="@style/EditName" /> style="@style/EditName" />
<TextView <TextView
android:text="@string/track_edit_activity_type" android:text="@string/track_edit_activity_type"
style="@style/EditLabel" /> style="@style/TextMedium" />
<AutoCompleteTextView <AutoCompleteTextView
android:hint="@string/track_edit_activity_type_hint" android:hint="@string/track_edit_activity_type_hint"
android:id="@+id/track_edit_activity_type" android:id="@+id/track_edit_activity_type"
@@ -46,7 +43,7 @@ limitations under the License.
style="@style/EditCategory" /> style="@style/EditCategory" />
<TextView <TextView
android:text="@string/generic_description" android:text="@string/generic_description"
style="@style/EditLabel" /> style="@style/TextMedium" />
<EditText <EditText
android:hint="@string/generic_description" android:hint="@string/generic_description"
android:id="@+id/track_edit_description" android:id="@+id/track_edit_description"
MyTracks/res/layout/track_list.xml
+3 -3
View File
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent" > android:layout_width="fill_parent" >
<ListView <ListView
@@ -26,7 +26,7 @@ limitations under the License.
android:id="@+id/track_list_empty" android:id="@+id/track_list_empty"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:orientation="vertical"> android:orientation="vertical" >
<TextView <TextView
android:text="@string/track_list_empty_message" android:text="@string/track_list_empty_message"
style="@style/ListEmptyTextView" > style="@style/ListEmptyTextView" >
@@ -40,4 +40,4 @@ limitations under the License.
android:src="@drawable/menu_record_track" android:src="@drawable/menu_record_track"
style="@android:style/Widget.DeviceDefault.ImageButton" /> style="@android:style/Widget.DeviceDefault.ImageButton" />
</LinearLayout> </LinearLayout>
</FrameLayout> </merge>
MyTracks/res/layout/track_widget.xml
+60 -66
View File
@@ -14,77 +14,71 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout android:background="@drawable/appwidget_background"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:paddingBottom="5dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:paddingTop="5dp" android:paddingTop="5dp" >
android:paddingBottom="5dp"> <ImageButton
<LinearLayout android:background="@android:color/transparent"
android:contentDescription="@string/my_tracks_app_name"
android:id="@+id/appwidget_button"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:background="@drawable/appwidget_background"> android:paddingLeft="10dp"
<ImageButton android:paddingRight="10dp"
android:id="@+id/appwidget_button" android:src="@drawable/appwidget_button_disabled" />
android:layout_height="fill_parent" <LinearLayout
android:layout_width="wrap_content" android:clickable="true"
android:background="@android:color/transparent" android:id="@+id/appwidget_track_statistics"
android:paddingLeft="10dp" android:layout_height="fill_parent"
android:paddingRight="10dp" android:layout_weight="1"
android:src="@drawable/appwidget_button_disabled" /> android:layout_width="0dp"
android:orientation="vertical"
android:paddingLeft="16dp" >
<LinearLayout <LinearLayout
android:id="@+id/appwidget_track_statistics" android:layout_height="wrap_content"
android:layout_height="fill_parent" android:layout_width="fill_parent"
android:layout_width="0dp" android:orientation="horizontal" >
android:layout_weight="1" <TextView
android:clickable="true" android:id="@+id/appwidget_distance_text"
android:orientation="vertical" style="@style/TrackWidgetValue" />
android:paddingLeft="15dp"> <TextView
<LinearLayout android:text="@string/stats_total_distance"
android:layout_height="wrap_content" style="@style/TextSmall" />
android:layout_width="fill_parent" </LinearLayout>
android:orientation="horizontal"> <LinearLayout
<TextView android:background="@color/appwidget_hr"
style="@style/WidgetTextView.Value" android:layout_height="1dp"
android:id="@+id/appwidget_distance_text" /> android:layout_width="fill_parent" />
<TextView <LinearLayout
style="@style/WidgetTextView" android:layout_height="wrap_content"
android:text="@string/stats_total_distance" /> android:layout_width="fill_parent"
</LinearLayout> android:orientation="horizontal" >
<LinearLayout <TextView
android:layout_width="fill_parent" android:id="@+id/appwidget_time_text"
android:layout_height="1dp" style="@style/TrackWidgetValue" />
android:background="@color/appwidget_hr" /> <TextView
<LinearLayout android:text="@string/stats_moving_time"
android:layout_height="wrap_content" style="@style/TextSmall" />
android:layout_width="fill_parent" </LinearLayout>
android:orientation="horizontal" <LinearLayout
android:paddingBottom="2dp"> android:background="@color/appwidget_hr"
<TextView android:layout_height="1dp"
style="@style/WidgetTextView.Value" android:layout_width="fill_parent" />
android:id="@+id/appwidget_time_text" /> <LinearLayout
<TextView android:layout_height="wrap_content"
style="@style/WidgetTextView" android:layout_width="fill_parent"
android:text="@string/stats_moving_time" /> android:orientation="horizontal" >
</LinearLayout> <TextView
<LinearLayout android:id="@+id/appwidget_speed_text"
android:layout_width="fill_parent" style="@style/TrackWidgetValue" />
android:layout_height="1dp" <TextView
android:background="@color/appwidget_hr" /> android:text="@string/stats_speed"
<LinearLayout style="@style/TextSmall" />
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal">
<TextView
style="@style/WidgetTextView.Value"
android:id="@+id/appwidget_speed_text" />
<TextView
style="@style/WidgetTextView"
android:text="@string/stats_speed" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
MyTracks/res/layout/upload_result.xml
+14 -28
View File
@@ -15,13 +15,12 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent" style="@style/ScrollView" >
android:layout_margin="8dp"
android:layout_width="fill_parent" >
<LinearLayout <LinearLayout
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:orientation="vertical" > android:orientation="vertical"
android:padding="8dp" >
<!-- Google Maps result --> <!-- Google Maps result -->
<LinearLayout <LinearLayout
android:id="@+id/upload_result_maps_result" android:id="@+id/upload_result_maps_result"
@@ -36,20 +35,17 @@ limitations under the License.
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:src="@drawable/success" /> android:src="@drawable/success" />
<LinearLayout <LinearLayout
android:layout_gravity="center_vertical"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="8dp" > android:paddingLeft="8dp" >
<TextView <TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_maps" android:text="@string/send_google_maps"
style="@android:style/TextAppearance.DeviceDefault.Medium" /> style="@style/TextMedium" />
<TextView <TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_maps_url" android:text="@string/send_google_maps_url"
style="@android:style/TextAppearance.DeviceDefault.Small" /> style="@style/TextSmall" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- Google Fusion Tables result --> <!-- Google Fusion Tables result -->
@@ -66,20 +62,17 @@ limitations under the License.
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:src="@drawable/success" /> android:src="@drawable/success" />
<LinearLayout <LinearLayout
android:layout_gravity="center_vertical"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="8dp" > android:paddingLeft="8dp" >
<TextView <TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_fusion_tables" android:text="@string/send_google_fusion_tables"
style="@android:style/TextAppearance.DeviceDefault.Medium" /> style="@style/TextMedium" />
<TextView <TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_fusion_tables_url" android:text="@string/send_google_fusion_tables_url"
style="@android:style/TextAppearance.DeviceDefault.Small" /> style="@style/TextSmall" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- Google Docs result --> <!-- Google Docs result -->
@@ -96,36 +89,29 @@ limitations under the License.
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:src="@drawable/success" /> android:src="@drawable/success" />
<LinearLayout <LinearLayout
android:layout_gravity="center_vertical"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="8dp" > android:paddingLeft="8dp" >
<TextView <TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_docs" android:text="@string/send_google_docs"
style="@android:style/TextAppearance.DeviceDefault.Medium" /> style="@style/TextMedium" />
<TextView <TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_docs_url" android:text="@string/send_google_docs_url"
style="@android:style/TextAppearance.DeviceDefault.Small" /> style="@style/TextSmall" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- Footer --> <!-- Footer -->
<TextView <TextView
android:id="@+id/upload_result_success_footer" android:id="@+id/upload_result_success_footer"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:padding="8dp" android:padding="8dp"
android:text="@string/send_google_success_footer" android:text="@string/send_google_success_footer"
style="@android:style/TextAppearance.DeviceDefault.Small" /> style="@style/TextSmall" />
<TextView <TextView
android:id="@+id/upload_result_error_footer" android:id="@+id/upload_result_error_footer"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:padding="8dp" android:padding="8dp"
android:text="@string/send_google_error" android:text="@string/send_google_error"
style="@android:style/TextAppearance.DeviceDefault.Medium" /> style="@style/TextMedium" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
MyTracks/res/layout/upload_service_chooser.xml
+13 -33
View File
@@ -15,27 +15,21 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent" style="@style/ScrollView" >
android:layout_width="fill_parent" >
<TableLayout <TableLayout
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:padding="8dp"
android:stretchColumns="1" > android:stretchColumns="1" >
<TableRow android:id="@+id/send_google_maps_row" > <TableRow android:id="@+id/send_google_maps_row" >
<ImageView <ImageView
android:contentDescription="@string/send_google_maps" android:contentDescription="@string/send_google_maps"
android:layout_height="wrap_content" android:src="@drawable/maps_icon"
android:layout_width="wrap_content" style="@style/UploadServiceChooserImageView" />
android:src="@drawable/maps_icon" />
<CheckBox <CheckBox
android:id="@+id/send_google_maps" 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" android:text="@string/send_google_maps"
style="@android:style/TextAppearance.DeviceDefault.Medium" /> style="@style/UploadServiceChooserCheckBox" />
</TableRow> </TableRow>
<TableRow android:id="@+id/send_google_maps_option_row" > <TableRow android:id="@+id/send_google_maps_option_row" >
<RadioGroup <RadioGroup
@@ -45,47 +39,33 @@ limitations under the License.
android:layout_width="0dp" > android:layout_width="0dp" >
<RadioButton <RadioButton
android:id="@+id/send_google_new_map" android:id="@+id/send_google_new_map"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_new_map" android:text="@string/send_google_new_map"
style="@android:style/TextAppearance.DeviceDefault.Medium" /> style="@style/TextMedium" />
<RadioButton <RadioButton
android:id="@+id/send_google_existing_map" android:id="@+id/send_google_existing_map"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/send_google_existing_map" android:text="@string/send_google_existing_map"
style="@android:style/TextAppearance.DeviceDefault.Medium" /> style="@style/TextMedium" />
</RadioGroup> </RadioGroup>
</TableRow> </TableRow>
<TableRow android:id="@+id/send_google_fusion_tables_row" > <TableRow android:id="@+id/send_google_fusion_tables_row" >
<ImageView <ImageView
android:contentDescription="@string/send_google_fusion_tables" android:contentDescription="@string/send_google_fusion_tables"
android:layout_height="wrap_content" android:src="@drawable/googledocs_icon"
android:layout_width="wrap_content" style="@style/UploadServiceChooserImageView" />
android:src="@drawable/googledocs_icon" />
<CheckBox <CheckBox
android:id="@+id/send_google_fusion_tables" 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" android:text="@string/send_google_fusion_tables"
style="@android:style/TextAppearance.DeviceDefault.Medium" /> style="@style/UploadServiceChooserCheckBox" />
</TableRow> </TableRow>
<TableRow android:id="@+id/send_google_docs_row" > <TableRow android:id="@+id/send_google_docs_row" >
<ImageView <ImageView
android:contentDescription="@string/send_google_docs" android:contentDescription="@string/send_google_docs"
android:layout_height="wrap_content" android:src="@drawable/googledocs_icon"
android:layout_width="wrap_content" style="@style/UploadServiceChooserImageView" />
android:src="@drawable/googledocs_icon" />
<CheckBox <CheckBox
android:id="@+id/send_google_docs" 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" android:text="@string/send_google_docs"
style="@android:style/TextAppearance.DeviceDefault.Medium" /> style="@style/UploadServiceChooserCheckBox" />
</TableRow> </TableRow>
</TableLayout> </TableLayout>
</ScrollView> </ScrollView>
MyTracks/res/layout/welcome.xml
+2 -3
View File
@@ -15,7 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent" style="@style/ScrollView" >
android:layout_width="fill_parent" > <include layout="@layout/help_content" />
<include layout="@layout/help_content"/>
</ScrollView> </ScrollView>
MyTracks/res/values/strings.xml
+2 -7
View File
@@ -929,11 +929,6 @@ limitations under the License.
'Maps' list page informing the user that he doesn't have any maps."> 'Maps' list page informing the user that he doesn't have any maps.">
You don\'t have any maps. You don\'t have any maps.
</string> </string>
<string name="maps_list_pick_map"
translation_description="When sending a track to an existing Google Map, the text on the
'Maps' list page asking the user to pick one of his maps.">
Pick a map:
</string>
<string name="maps_list_progress_message" <string name="maps_list_progress_message"
translation_description="When sending a track to an existing Google Map, the progress message translation_description="When sending a track to an existing Google Map, the progress message
informing the user that his maps are being loaded."> informing the user that his maps are being loaded.">
@@ -946,8 +941,8 @@ limitations under the License.
</string> </string>
<string name="maps_list_title" <string name="maps_list_title"
translation_description="When sending a track to an existing Google Map, the title of the translation_description="When sending a track to an existing Google Map, the title of the
page listing the user's maps in Google Maps."> page asking the user to pick a map.">
Your Google Maps Pick a Map
</string> </string>
<string name="maps_list_unlisted_label" <string name="maps_list_unlisted_label"
translation_description="When sending a track to an existing Google Map, in the 'Maps' translation_description="When sending a track to an existing Google Map, in the 'Maps'
MyTracks/res/values/styles.xml
+66 -80
View File
@@ -15,6 +15,10 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<resources> <resources>
<!-- The style for the about value -->
<style name="AboutValue" parent="@style/TextMedium">
<item name="android:paddingLeft">48dp</item>
</style>
<!-- The style for the bottom button --> <!-- The style for the bottom button -->
<style name="BottomButton" parent="@android:style/Widget.DeviceDefault.Button.Borderless"> <style name="BottomButton" parent="@android:style/Widget.DeviceDefault.Button.Borderless">
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
@@ -28,100 +32,57 @@ limitations under the License.
<item name="android:orientation">horizontal</item> <item name="android:orientation">horizontal</item>
</style> </style>
<!-- The style for the edit category --> <!-- The style for the edit category -->
<style name="EditCategory" parent="@android:style/TextAppearance.DeviceDefault.Medium"> <style name="EditCategory" parent="@style/TextMedium">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">fill_parent</item> <item name="android:layout_width">fill_parent</item>
<item name="android:selectAllOnFocus">true</item> <item name="android:selectAllOnFocus">true</item>
<item name="android:singleLine">true</item> <item name="android:singleLine">true</item>
</style> </style>
<!-- The style for the edit description --> <!-- The style for the edit description -->
<style name="EditDescription" parent="@android:style/TextAppearance.DeviceDefault.Medium"> <style name="EditDescription" parent="@style/TextMedium">
<item name="android:inputType">textAutoCorrect|textCapSentences</item> <item name="android:inputType">textAutoCorrect|textCapSentences</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">fill_parent</item> <item name="android:layout_width">fill_parent</item>
<item name="android:maxLines">50</item> <item name="android:maxLines">50</item>
<item name="android:selectAllOnFocus">true</item> <item name="android:selectAllOnFocus">true</item>
<item name="android:singleLine">false</item> <item name="android:singleLine">false</item>
</style> </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 --> <!-- The style for the edit name -->
<style name="EditName" parent="@android:style/TextAppearance.DeviceDefault.Medium"> <style name="EditName" parent="@style/TextMedium.WithIcon">
<item name="android:drawablePadding">8dp</item>
<item name="android:gravity">center_vertical</item>
<item name="android:inputType">textAutoCorrect|textCapWords</item> <item name="android:inputType">textAutoCorrect|textCapWords</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">fill_parent</item> <item name="android:layout_width">fill_parent</item>
<item name="android:selectAllOnFocus">true</item> <item name="android:selectAllOnFocus">true</item>
<item name="android:singleLine">true</item> <item name="android:singleLine">true</item>
</style> </style>
<!-- The style for the list empty text view --> <!-- The style for the list empty text view -->
<style name="ListEmptyTextView" parent="@android:style/TextAppearance.DeviceDefault.Large"> <style name="ListEmptyTextView" parent="@style/TextLarge">
<item name="android:gravity">center</item> <item name="android:gravity">center</item>
<item name="android:layout_gravity">center</item> <item name="android:layout_gravity">center</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:padding">8dp</item> <item name="android:padding">8dp</item>
</style> </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_marginLeft">8dp</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:singleLine">true</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>
<item name="android:textColor">@android:color/secondary_text_dark</item>
</style>
<!-- The style for the list item name -->
<style name="ListItemName" parent="@android:style/TextAppearance.DeviceDefault.Large">
<item name="android:gravity">center_vertical</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:drawablePadding">8dp</item>
<item name="android:singleLine">true</item>
</style>
<!-- style for the list item stats --> <!-- style for the list item stats -->
<style name="ListItemStats" parent="@android:style/TextAppearance.DeviceDefault.Small"> <style name="ListItemStats" parent="@style/TextSmall">
<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:singleLine">true</item>
<item name="android:textColor">@android:color/secondary_text_dark</item> <item name="android:textColor">@android:color/secondary_text_dark</item>
</style> </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 sensor state label -->
<style name="SensorStateLabel" 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 sensor state value -->
<style name="SensorStateValue" parent="@android:style/TextAppearance.DeviceDefault.Large">
<item name="android:background">@android:color/background_light</item>
<item name="android:gravity">right</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:textColor">@android:color/primary_text_light</item>
</style>
<!-- The style for the scroll view --> <!-- The style for the scroll view -->
<style name="ScrollView"> <style name="ScrollView">
<item name="android:layout_height">fill_parent</item> <item name="android:layout_height">fill_parent</item>
<item name="android:layout_width">fill_parent</item> <item name="android:layout_width">fill_parent</item>
<item name="android:scrollbarStyle">outsideInset</item> <item name="android:scrollbarStyle">outsideInset</item>
</style> </style>
<!-- The style for the scroll view with bottom buttons -->
<style name="ScrollView.WithBottomButtons">
<item name="android:layout_height">0dp</item>
<item name="android:layout_weight">1</item>
</style>
<!-- The style for the sensor state value -->
<style name="SensorStateValue" parent="@style/TextLarge">
<item name="android:background">@android:color/background_light</item>
<item name="android:gravity">right</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:textColor">@android:color/primary_text_light</item>
</style>
<!-- The style for the stats label --> <!-- The style for the stats label -->
<style name="StatsLabel" parent="@android:style/TextAppearance.DeviceDefault.Medium"> <style name="StatsLabel" parent="@style/TextMedium">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">1</item> <item name="android:layout_weight">1</item>
<item name="android:layout_width">0dp</item> <item name="android:layout_width">0dp</item>
</style> </style>
@@ -131,37 +92,62 @@ limitations under the License.
<item name="android:layout_width">8dp</item> <item name="android:layout_width">8dp</item>
</style> </style>
<!-- The style for the stats value --> <!-- The style for the stats value -->
<style name="StatsValue" parent="@android:style/TextAppearance.DeviceDefault.Large"> <style name="StatsValue" parent="@style/TextLarge">
<item name="android:background">@android:color/background_light</item> <item name="android:background">@android:color/background_light</item>
<item name="android:gravity">right</item> <item name="android:gravity">right</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">1</item> <item name="android:layout_weight">1</item>
<item name="android:layout_width">0dp</item> <item name="android:layout_width">0dp</item>
<item name="android:textColor">@android:color/primary_text_light</item> <item name="android:textColor">@android:color/primary_text_light</item>
</style> </style>
<style name="ThemeSelector" parent="android:Theme" /> <!-- The style for large size text -->
<!-- The style for the welcome page answer --> <style name="TextLarge" parent="@android:style/TextAppearance.DeviceDefault.Large">
<style name="WelcomeAnswerTextView" parent="@android:style/TextAppearance.DeviceDefault.Small">
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
</style>
<!-- The style for large size text with an icon on the left -->
<style name="TextLarge.WithIcon">
<item name="android:drawablePadding">8dp</item>
<item name="android:gravity">center_vertical</item>
</style>
<!-- The style for medium size text -->
<style name="TextMedium" 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 medium size text with an icon on the left -->
<style name="TextMedium.WithIcon">
<item name="android:drawablePadding">8dp</item>
<item name="android:gravity">center_vertical</item>
</style>
<!-- The style for large size text -->
<style name="TextSmall" parent="@android:style/TextAppearance.DeviceDefault.Small">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
</style>
<!-- Theme selector -->
<style name="ThemeSelector" parent="android:Theme" />
<!-- The style for the track widget value -->
<style name="TrackWidgetValue" parent="@style/TextSmall">
<item name="android:width">100dp</item>
</style>
<!-- The style for upload service chooser check box -->
<style name="UploadServiceChooserCheckBox" parent="@style/TextMedium">
<item name="android:layout_gravity">center_vertical</item>
<item name="android:layout_marginLeft">8dp</item>
<item name="android:layout_width">0dp</item>
</style>
<!-- The style for upload service chooser image view -->
<style name="UploadServiceChooserImageView">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
</style>
<!-- The style for the welcome page answer -->
<style name="WelcomeAnswerTextView" parent="@style/TextSmall">
<item name="android:paddingBottom">8dp</item> <item name="android:paddingBottom">8dp</item>
</style> </style>
<!-- The style for welcome page question --> <!-- The style for welcome page question -->
<style name="WelcomeQuestionTextView" parent="@android:style/TextAppearance.DeviceDefault.Medium"> <style name="WelcomeQuestionTextView" parent="@style/TextMedium">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:paddingTop">8dp</item> <item name="android:paddingTop">8dp</item>
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
</style> </style>
<!-- The style for the widget label -->
<style name="WidgetTextView">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:textColor">@color/appwidget_text</item>
<item name="android:textSize">14sp</item>
</style>
<!-- The style for the widget value -->
<style name="WidgetTextView.Value">
<item name="android:width">160px</item>
</style>
</resources> </resources>
MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+1 -1
View File
@@ -144,7 +144,7 @@ public class TrackDetailActivity extends FragmentActivity {
trackDataHub = ((MyTracksApplication) getApplication()).getTrackDataHub(); trackDataHub = ((MyTracksApplication) getApplication()).getTrackDataHub();
trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null); trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
mapViewContainer = getLayoutInflater().inflate(R.layout.mytracks_layout, null); mapViewContainer = getLayoutInflater().inflate(R.layout.map, null);
tabHost = (TabHost) findViewById(android.R.id.tabhost); tabHost = (TabHost) findViewById(android.R.id.tabhost);
tabHost.setup(); tabHost.setup();
tabManager = new TabManager(this, tabHost, R.id.realtabcontent); tabManager = new TabManager(this, tabHost, R.id.realtabcontent);
MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java
+5 -14
View File
@@ -42,7 +42,6 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams; import android.view.ViewGroup.LayoutParams;
import android.widget.LinearLayout;
import android.widget.ZoomControls; import android.widget.ZoomControls;
import java.util.ArrayList; import java.util.ArrayList;
@@ -77,7 +76,6 @@ public class ChartFragment extends Fragment implements TrackDataListener {
// UI elements // UI elements
private ChartView chartView; private ChartView chartView;
private LinearLayout busyPane;
private ZoomControls zoomControls; private ZoomControls zoomControls;
/** /**
@@ -91,7 +89,6 @@ public class ChartFragment extends Fragment implements TrackDataListener {
return; return;
} }
busyPane.setVisibility(View.GONE);
zoomControls.setIsZoomInEnabled(chartView.canZoomIn()); zoomControls.setIsZoomInEnabled(chartView.canZoomIn());
zoomControls.setIsZoomOutEnabled(chartView.canZoomOut()); zoomControls.setIsZoomOutEnabled(chartView.canZoomOut());
chartView.setShowPointer(isRecording()); chartView.setShowPointer(isRecording());
@@ -113,9 +110,8 @@ public class ChartFragment extends Fragment implements TrackDataListener {
@Override @Override
public View onCreateView( public View onCreateView(
LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.mytracks_charts, container, false); View view = inflater.inflate(R.layout.chart, container, false);
busyPane = (LinearLayout) view.findViewById(R.id.elevation_busypane); zoomControls = (ZoomControls) view.findViewById(R.id.chart_zoom_controls);
zoomControls = (ZoomControls) view.findViewById(R.id.elevation_zoom);
zoomControls.setOnZoomInClickListener(new View.OnClickListener() { zoomControls.setOnZoomInClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@@ -134,7 +130,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
ViewGroup layout = (ViewGroup) getActivity().findViewById(R.id.elevation_chart); ViewGroup layout = (ViewGroup) getActivity().findViewById(R.id.chart_view_layout);
LayoutParams layoutParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams layoutParams = new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.MATCH_PARENT); LayoutParams.MATCH_PARENT);
layout.addView(chartView, layoutParams); layout.addView(chartView, layoutParams);
@@ -156,7 +152,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
@Override @Override
public void onStop() { public void onStop() {
super.onStop(); super.onStop();
ViewGroup layout = (ViewGroup) getActivity().findViewById(R.id.elevation_chart); ViewGroup layout = (ViewGroup) getActivity().findViewById(R.id.chart_view_layout);
layout.removeView(chartView); layout.removeView(chartView);
} }
@@ -229,12 +225,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
@Override @Override
public void onSelectedTrackChanged(Track track, boolean isRecording) { public void onSelectedTrackChanged(Track track, boolean isRecording) {
getActivity().runOnUiThread(new Runnable() { // We don't care.
@Override
public void run() {
busyPane.setVisibility(View.VISIBLE);
}
});
} }
@Override @Override
MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java
+9 -21
View File
@@ -43,8 +43,6 @@ import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
@@ -85,11 +83,8 @@ public class MapFragment extends Fragment
// UI elements // UI elements
private View mapViewContainer; private View mapViewContainer;
private MapOverlay mapOverlay; private MapOverlay mapOverlay;
private RelativeLayout screen;
private MapView mapView; private MapView mapView;
private LinearLayout messagePane; private TextView messageTextView;
private TextView messageText;
private LinearLayout busyPane;
@Override @Override
public View onCreateView( public View onCreateView(
@@ -98,15 +93,12 @@ public class MapFragment extends Fragment
mapOverlay = new MapOverlay(getActivity()); mapOverlay = new MapOverlay(getActivity());
screen = (RelativeLayout) mapViewContainer.findViewById(R.id.screen); mapView = (MapView) mapViewContainer.findViewById(R.id.map_view);
mapView = (MapView) mapViewContainer.findViewById(R.id.map);
mapView.requestFocus(); mapView.requestFocus();
mapView.setOnTouchListener(this); mapView.setOnTouchListener(this);
mapView.setBuiltInZoomControls(true); mapView.setBuiltInZoomControls(true);
mapView.getOverlays().add(mapOverlay); mapView.getOverlays().add(mapOverlay);
messagePane = (LinearLayout) mapViewContainer.findViewById(R.id.messagepane); messageTextView = (TextView) mapViewContainer.findViewById(R.id.map_message);
messageText = (TextView) mapViewContainer.findViewById(R.id.messagetext);
busyPane = (LinearLayout) mapViewContainer.findViewById(R.id.busypane);
return mapViewContainer; return mapViewContainer;
} }
@@ -238,7 +230,7 @@ public class MapFragment extends Fragment
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (v == messagePane) { if (v == messageTextView) {
Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS); Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
startActivity(intent); startActivity(intent);
} }
@@ -270,21 +262,20 @@ public class MapFragment extends Fragment
@Override @Override
public void run() { public void run() {
if (messageId != -1) { if (messageId != -1) {
messageText.setText(messageId); messageTextView.setText(messageId);
messagePane.setVisibility(View.VISIBLE); messageTextView.setVisibility(View.VISIBLE);
if (isGpsDisabled) { if (isGpsDisabled) {
Toast.makeText(getActivity(), R.string.gps_not_found, Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), R.string.gps_not_found, Toast.LENGTH_LONG).show();
// Click to show the location source settings // Click to show the location source settings
messagePane.setOnClickListener(MapFragment.this); messageTextView.setOnClickListener(MapFragment.this);
} else { } else {
messagePane.setOnClickListener(null); messageTextView.setOnClickListener(null);
} }
} else { } else {
messagePane.setVisibility(View.GONE); messageTextView.setVisibility(View.GONE);
} }
screen.requestLayout();
} }
}); });
} }
@@ -311,8 +302,6 @@ public class MapFragment extends Fragment
mapOverlay.setTrackDrawingEnabled(hasTrack); mapOverlay.setTrackDrawingEnabled(hasTrack);
if (hasTrack) { if (hasTrack) {
busyPane.setVisibility(View.VISIBLE);
synchronized (this) { synchronized (this) {
/* /*
* Synchronize to prevent race condition in changing markerTrackId * Synchronize to prevent race condition in changing markerTrackId
@@ -322,7 +311,6 @@ public class MapFragment extends Fragment
updateMap(track); updateMap(track);
} }
mapOverlay.setShowEndMarker(!isRecording); mapOverlay.setShowEndMarker(!isRecording);
busyPane.setVisibility(View.GONE);
} }
mapView.invalidate(); mapView.invalidate();
} }
MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivity.java
+3 -3
View File
@@ -68,11 +68,11 @@ public class ChooseMapActivity extends Activity {
} }
MapsMapMetadata mapData = getItem(position).getMapData(); MapsMapMetadata mapData = getItem(position).getMapData();
TextView title = (TextView) convertView.findViewById(R.id.choose_map_list_item_title); TextView title = (TextView) convertView.findViewById(R.id.choose_map_item_title);
title.setText(mapData.getTitle()); title.setText(mapData.getTitle());
TextView description = (TextView) convertView.findViewById( TextView description = (TextView) convertView.findViewById(
R.id.choose_map_list_item_description); R.id.choose_map_item_description);
String descriptionText = mapData.getDescription(); String descriptionText = mapData.getDescription();
if (descriptionText == null || descriptionText.equals("")) { if (descriptionText == null || descriptionText.equals("")) {
description.setVisibility(View.GONE); description.setVisibility(View.GONE);
@@ -82,7 +82,7 @@ public class ChooseMapActivity extends Activity {
} }
TextView searchStatus = (TextView) convertView.findViewById( TextView searchStatus = (TextView) convertView.findViewById(
R.id.choose_map_list_item_search_status); R.id.choose_map_item_search_status);
searchStatus.setTextColor(mapData.getSearchable() ? Color.RED : Color.GREEN); searchStatus.setTextColor(mapData.getSearchable() ? Color.RED : Color.GREEN);
searchStatus.setText(mapData.getSearchable() ? R.string.maps_list_public_label searchStatus.setText(mapData.getSearchable() ? R.string.maps_list_public_label
: R.string.maps_list_unlisted_label); : R.string.maps_list_unlisted_label);