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

Merge heads

Browse Source
This commit is contained in:
youtaol
2013-07-04 10:08:14 +08:00
parent d106bc520e
commit 97f6afae3b
32 changed files with 83 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/list_item.xml
+1
View File
@@ -52,6 +52,7 @@ limitations under the License.
style="@style/ListItemDate" />
</TableRow>
<TableRow>
<!-- Need to match the style set in ListItemUtils.setListItem -->
<TextView
android:id="@+id/list_item_time_distance"
android:layout_gravity="bottom"
MyTracks/res/layout/map.xml
+1 -1
View File
@@ -21,7 +21,7 @@ limitations under the License.
<TextView
android:background="@color/warning_background"
android:drawableLeft="@drawable/warning"
android:gravity="center"
android:gravity="left|center_vertical"
android:id="@+id/map_message"
android:layout_alignParentTop="true"
android:layout_width="match_parent"
MyTracks/res/layout/track_widget_4x2.xml
+1 -6
View File
@@ -144,12 +144,7 @@ limitations under the License.
style="@style/TrackWidgetButton" />
<TextView
android:id="@+id/track_widget_record_status"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_width="0dp"
android:singleLine="true"
style="@style/TextSmall" />
style="@style/TrackWidgetRecordStatus" />
<ImageButton
android:contentDescription="@string/icon_stop_recording"
android:id="@+id/track_widget_stop_button"
MyTracks/res/layout/track_widget_4x3.xml
+1 -6
View File
@@ -144,12 +144,7 @@ limitations under the License.
style="@style/TrackWidgetButton" />
<TextView
android:id="@+id/track_widget_record_status"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_width="0dp"
android:singleLine="true"
style="@style/TextSmall" />
style="@style/TrackWidgetRecordStatus" />
<ImageButton
android:contentDescription="@string/icon_stop_recording"
android:id="@+id/track_widget_stop_button"
MyTracks/res/layout/track_widget_4x4.xml
+1 -6
View File
@@ -148,12 +148,7 @@ limitations under the License.
style="@style/TrackWidgetButton" />
<TextView
android:id="@+id/track_widget_record_status"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_width="0dp"
android:singleLine="true"
style="@style/TextSmall" />
style="@style/TrackWidgetRecordStatus" />
<ImageButton
android:contentDescription="@string/icon_stop_recording"
android:id="@+id/track_widget_stop_button"
MyTracks/res/layout/upload_result.xml
-148
View File
@@ -1,148 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/ScrollView" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical"
android:padding="8dp" >
<!-- Google Drive result -->
<LinearLayout
android:id="@+id/upload_result_drive_result"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="horizontal" >
<ImageView
android:contentDescription="@string/generic_success_title"
android:id="@+id/upload_result_drive_result_icon"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:padding="4dp"
android:src="@drawable/success" />
<LinearLayout
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical"
android:paddingLeft="8dp" >
<TextView
android:text="@string/export_google_drive"
style="@style/TextMedium" />
<TextView
android:text="@string/export_google_drive_url"
style="@style/TextSmall" />
</LinearLayout>
</LinearLayout>
<!-- Google Maps result -->
<LinearLayout
android:id="@+id/upload_result_maps_result"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="horizontal" >
<ImageView
android:contentDescription="@string/generic_success_title"
android:id="@+id/upload_result_maps_result_icon"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:padding="4dp"
android:src="@drawable/success" />
<LinearLayout
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical"
android:paddingLeft="8dp" >
<TextView
android:text="@string/export_google_maps"
style="@style/TextMedium" />
<TextView
android:text="@string/export_google_maps_url"
style="@style/TextSmall" />
</LinearLayout>
</LinearLayout>
<!-- Google Fusion Tables result -->
<LinearLayout
android:id="@+id/upload_result_fusion_tables_result"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="horizontal" >
<ImageView
android:contentDescription="@string/generic_success_title"
android:id="@+id/upload_result_fusion_tables_result_icon"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:padding="4dp"
android:src="@drawable/success" />
<LinearLayout
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical"
android:paddingLeft="8dp" >
<TextView
android:text="@string/export_google_fusion_tables"
style="@style/TextMedium" />
<TextView
android:text="@string/export_google_fusion_tables_url"
style="@style/TextSmall" />
</LinearLayout>
</LinearLayout>
<!-- Google Spreadsheets result -->
<LinearLayout
android:id="@+id/upload_result_spreadsheets_result"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="horizontal" >
<ImageView
android:contentDescription="@string/generic_success_title"
android:id="@+id/upload_result_spreadsheets_result_icon"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:padding="4dp"
android:src="@drawable/success" />
<LinearLayout
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical"
android:paddingLeft="8dp" >
<TextView
android:text="@string/export_google_spreadsheets"
style="@style/TextMedium" />
<TextView
android:text="@string/export_google_spreadsheets_url"
style="@style/TextSmall" />
</LinearLayout>
</LinearLayout>
<!-- Footer -->
<TextView
android:id="@+id/upload_result_success_footer"
android:padding="8dp"
android:text="@string/send_google_success_footer"
style="@style/TextSmall" />
<TextView
android:id="@+id/upload_result_error_footer"
android:padding="8dp"
android:text="@string/send_google_error"
style="@style/TextMedium" />
</LinearLayout>
</ScrollView>