upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 17:43:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2012-03-20 11:11:26 -07:00
parent 0562165421 1c3dd62d28
commit 887c4e3dd1
23 changed files with 251 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/proguard.cfg
+3 -3
View File
@@ -35,15 +35,15 @@
-keep public class * extends android.preference.Preference
-keep public class com.android.vending.licensing.ILicensingService
-keepclasseswithmembernames class * {
-keepclasseswithmembers class * {
native <methods>;
}
-keepclasseswithmembernames class * {
-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet);
}
-keepclasseswithmembernames class * {
-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet, int);
}
MyTracks/res/layout/about.xml
+1
View File
@@ -30,6 +30,7 @@ limitations under the License.
android:layout_width="fill_parent"
android:orientation="horizontal">
<ImageView
android:contentDescription="@string/my_tracks_app_name"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
MyTracks/res/layout/chart_settings.xml
+18 -31
View File
@@ -23,16 +23,14 @@ limitations under the License.
android:layout_width="fill_parent"
android:shrinkColumns="0"
android:stretchColumns="0">
<TableRow>
<TextView
android:background="@drawable/list_bar"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:paddingLeft="10dp"
android:text="@string/menu_chart_view_chart_settings"
android:textColor="@color/white"
android:textSize="20sp"/>
</TableRow>
<TextView
android:background="@drawable/list_bar"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:paddingLeft="10dp"
android:text="@string/menu_chart_view_chart_settings"
android:textColor="@color/white"
android:textSize="20sp"/>
</TableLayout>
<ScrollView
android:layout_height="0dp"
@@ -43,17 +41,12 @@ limitations under the License.
android:layout_width="fill_parent"
android:orientation="vertical"
android:padding="10dp">
<!-- X axis -->
<LinearLayout style="@style/ChartSettingsAxisLayout">
<ImageView
android:src="@drawable/x_axis"
style="@style/ChartSettingsAxisImage"/>
<TextView
android:text="@string/chart_settings_x_axis"
style="@style/ChartSettingsAxisText"/>
</LinearLayout>
<TextView
android:drawableLeft="@drawable/x_axis"
android:drawablePadding="10dp"
android:text="@string/chart_settings_x_axis"
style="@style/ChartSettingsAxisText"/>
<RadioGroup
android:id="@+id/chart_settings_x"
android:layout_height="wrap_content"
@@ -67,19 +60,13 @@ limitations under the License.
android:text="@string/chart_settings_by_time"
style="@style/ChartSettingsRadioButton"/>
</RadioGroup>
<!-- Y axis -->
<LinearLayout
<TextView
android:drawableLeft="@drawable/y_axis"
android:drawablePadding="10dp"
android:paddingTop="10dp"
style="@style/ChartSettingsAxisLayout">
<ImageView
android:src="@drawable/y_axis"
style="@style/ChartSettingsAxisImage"/>
<TextView
android:text="@string/chart_settings_y_axis"
style="@style/ChartSettingsAxisText"/>
</LinearLayout>
android:text="@string/chart_settings_y_axis"
style="@style/ChartSettingsAxisText"/>
<CheckBox
android:id="@+id/chart_settings_elevation"
android:text="@string/stat_elevation"
MyTracks/res/layout/mytracks_charts.xml
+8 -11
View File
@@ -23,15 +23,13 @@ limitations under the License.
<LinearLayout android:id="@+id/elevation_chart"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1">
android:layout_height="fill_parent">
</LinearLayout>
<RelativeLayout android:id="@+id/elevation_zoom_layout"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="10dip"
android:layout_weight="0">
android:padding="10dp">
<ZoomControls android:id="@+id/elevation_zoom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -44,17 +42,16 @@ limitations under the License.
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="0"
android:padding="3dip"
android:padding="3dp"
android:visibility="gone">
<ProgressBar
android:layout_weight="1"
android:layout_height="0dip"
android:layout_height="0dp"
android:layout_width="wrap_content"
android:maxWidth="80dip"
android:maxHeight="80dip"
android:minWidth="80dip"
android:minHeight="80dip"
android:maxWidth="80dp"
android:maxHeight="80dp"
android:minWidth="80dp"
android:minHeight="80dp"
android:layout_gravity="center"/>
</LinearLayout>
</RelativeLayout>
MyTracks/res/layout/mytracks_layout.xml
+11 -13
View File
@@ -33,32 +33,30 @@ limitations under the License.
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_bar"
android:layout_weight="0"
android:padding="3dip"
android:padding="3dp"
android:visibility="gone">
<TextView android:id="@+id/messagetext"
android:layout_width="fill_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="16dip"
android:textSize="16dp"
android:textColor="#fff"
android:text="@string/gps_wait_for_fix"
android:layout_weight="0"/>
android:layout_weight="1"/>
</LinearLayout>
<LinearLayout android:id="@+id/busypane"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="0"
android:padding="3dip"
android:padding="3dp"
android:visibility="gone">
<ProgressBar
android:layout_weight="1"
android:layout_height="0dip"
android:layout_height="0dp"
android:layout_width="wrap_content"
android:maxWidth="80dip"
android:maxHeight="80dip"
android:minWidth="80dip"
android:minHeight="80dip"
android:maxWidth="80dp"
android:maxHeight="80dp"
android:minWidth="80dp"
android:minHeight="80dp"
android:layout_gravity="center"/>
</LinearLayout>
<LinearLayout
@@ -67,7 +65,7 @@ limitations under the License.
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="center"
android:paddingTop="10dip">
android:paddingTop="10dp">
<LinearLayout
android:layout_width = "wrap_content"
android:layout_height= "wrap_content"
MyTracks/res/layout/mytracks_list.xml
+4 -4
View File
@@ -26,14 +26,14 @@ limitations under the License.
android:layout_height="wrap_content"
android:background="@drawable/list_bar"
android:layout_weight="0"
android:padding="3dip">
android:padding="3dp">
<TextView android:id="@+id/message"
android:layout_width="fill_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="16dip"
android:textSize="16dp"
android:textColor="#fff"
android:text="@string/track_list_pick_one"
android:layout_weight="0"/>
android:layout_weight="1"/>
</LinearLayout>
<ListView android:id="@android:id/list"
android:layout_width="fill_parent"
MyTracks/res/layout/mytracks_list_item.xml
+13 -13
View File
@@ -19,32 +19,32 @@ limitations under the License.
android:layout_width="fill_parent"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical"
android:paddingBottom="2dip"
android:paddingTop="2dip">
android:paddingBottom="2dp"
android:paddingTop="2dp">
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal">
<ImageView android:id="@+id/track_list_item_icon"
android:contentDescription="@string/track_list_icon_description"
android:contentDescription="@string/track_icon_description"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:paddingLeft="4dip"
android:paddingRight="2dip"
android:paddingTop="5dip"
android:paddingLeft="4dp"
android:paddingRight="2dp"
android:paddingTop="5dp"
android:src="@drawable/track" />
<TextView android:id="@+id/track_list_item_name"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginTop="6dip"
android:layout_marginLeft="6dp"
android:layout_marginTop="6dp"
android:layout_width="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceLarge"/>
<TextView android:id="@+id/track_list_item_category"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginTop="6dip"
android:layout_marginLeft="6dp"
android:layout_marginTop="6dp"
android:layout_width="fill_parent"
android:singleLine = "true"
android:textAppearance="?android:attr/textAppearanceSmall"/>
@@ -53,21 +53,21 @@ limitations under the License.
<TextView android:id="@+id/track_list_item_time"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginLeft="6dp"
android:singleLine="true"
android:textColor="#fff"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView android:id="@+id/track_list_item_stats"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginLeft="6dp"
android:singleLine="true"
android:textColor="#0f0"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView android:id="@+id/track_list_item_description"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft = "6dip"
android:layout_marginLeft = "6dp"
android:singleLine = "false"
android:textAppearance="?android:attr/textAppearanceSmall"/>
MyTracks/res/layout/mytracks_marker_item.xml
+37 -44
View File
@@ -15,54 +15,47 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:paddingTop="2dip"
android:paddingBottom="2dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical">
android:orientation="horizontal"
android:paddingBottom="2dp"
android:paddingTop="2dp" >
<ImageView
android:contentDescription="@string/marker_icon_description"
android:id="@+id/waypointslist_item_icon"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_marginTop="6dp"
android:layout_width="wrap_content"
android:src="@drawable/ylw_pushpin" />
<LinearLayout
android:orientation="horizontal"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<ImageView android:id="@+id/waypointslist_item_icon"
android:layout_width="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/waypointslist_item_name"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginTop="6dip"
android:src="@drawable/ylw_pushpin"
android:contentDescription="@string/marker_list_icon_description"/>
<LinearLayout
android:orientation="vertical"
android:layout_marginLeft="6dp"
android:layout_marginTop="6dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/waypointslist_item_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginTop="6dip"
android:singleLine = "true"
android:textAppearance="?android:attr/textAppearanceLarge"/>
<TextView android:id="@+id/waypointslist_item_time"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft = "6dip"
android:singleLine = "true"
android:textColor = "#fff"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView android:id="@+id/waypointslist_item_category"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft = "6dip"
android:singleLine = "true"
android:textColor="#0f0"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/waypointslist_item_time"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_width="fill_parent"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#fff" />
<TextView
android:id="@+id/waypointslist_item_category"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_width="fill_parent"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#0f0" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
MyTracks/res/layout/mytracks_waypoint_details.xml
+75 -74
View File
@@ -21,7 +21,7 @@ limitations under the License.
android:background="#c000">
<ScrollView
android:id="@+id/scrolly"
android:layout_height="0dip"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="fill_parent"
android:scrollbarStyle="insideInset">
@@ -38,12 +38,13 @@ limitations under the License.
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView android:id="@+id/waypointdetails_icon"
android:contentDescription="@string/marker_icon_description"
android:src="@drawable/ylw_pushpin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingLeft="4dip"
android:paddingRight="2dip"/>
android:paddingLeft="4dp"
android:paddingRight="2dp"/>
<EditText android:id="@+id/waypointdetails_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -57,7 +58,7 @@ limitations under the License.
<LinearLayout android:id="@+id/waypointdetails_description_layout"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_height="0dp"
android:visibility="visible"
android:layout_weight="1">
<TextView android:id="@+id/waypointdetails_category_label"
@@ -75,7 +76,7 @@ limitations under the License.
android:layout_height="wrap_content"/>
<EditText android:id="@+id/waypointdetails_description"
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_height="0dp"
android:singleLine="false"
android:autoText="true"
android:capitalize="sentences"
@@ -90,13 +91,13 @@ limitations under the License.
<TableLayout android:id="@+id/waypoint_stats"
android:visibility="gone"
android:padding="2dip"
android:padding="2dp"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:stretchColumns="1,4">
<!-- Total distance and max speed -->
<TableRow
android:padding="1dip">
android:padding="1dp">
<TextView
android:id="@+id/total_distance_label"
android:layout_column="1"
@@ -114,8 +115,8 @@ limitations under the License.
android:gravity="right"
android:id="@+id/total_distance_register"
android:layout_column="1"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -123,8 +124,8 @@ limitations under the License.
android:gravity="left"
android:id="@+id/total_distance_unit_label"
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/unit_mile"
android:textColor="@color/stat_label_text" />
<!-- TODO 4/08/2009
@@ -135,16 +136,16 @@ limitations under the License.
<TextView
android:background="@color/black"
android:layout_column="3"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_width="5dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="5dp"
android:textSize="40sp" />
<TextView
android:gravity="right"
android:id="@+id/max_speed_register"
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -158,20 +159,20 @@ limitations under the License.
android:id="@+id/max_speed_unit_label_top"
android:gravity="bottom"
android:layout_height="wrap_content"
android:layout_marginBottom="-1dip"
android:layout_marginTop="-1dip"
android:layout_marginBottom="-1dp"
android:layout_marginTop="-1dp"
android:layout_width="wrap_content"
android:textColor="@color/stat_label_text" />
<TextView
android:background="@color/black"
android:layout_height="3dip"
android:layout_height="3dp"
android:layout_width="fill_parent" />
<TextView
android:id="@+id/max_speed_unit_label_bottom"
android:gravity="bottom"
android:layout_height="wrap_content"
android:layout_marginBottom="-1dip"
android:layout_marginTop="-1dip"
android:layout_marginBottom="-1dp"
android:layout_marginTop="-1dp"
android:layout_width="wrap_content"
android:textColor="@color/stat_label_text" />
</LinearLayout>
@@ -197,8 +198,8 @@ limitations under the License.
android:id="@+id/total_time_register"
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_span="2"
android:layout_width="fill_parent"
android:text="@string/value_unknown"
@@ -207,16 +208,16 @@ limitations under the License.
<TextView
android:background="@color/black"
android:layout_column="3"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_width="5dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="5dp"
android:textSize="40sp" />
<TextView
android:gravity="right"
android:id="@+id/average_speed_register"
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -230,20 +231,20 @@ limitations under the License.
android:id="@+id/average_speed_unit_label_top"
android:gravity="bottom"
android:layout_height="wrap_content"
android:layout_marginBottom="-1dip"
android:layout_marginTop="-1dip"
android:layout_marginBottom="-1dp"
android:layout_marginTop="-1dp"
android:layout_width="wrap_content"
android:textColor="@color/stat_label_text" />
<TextView
android:background="@color/black"
android:layout_height="3dip"
android:layout_height="3dp"
android:layout_width="fill_parent" />
<TextView
android:id="@+id/average_speed_unit_label_bottom"
android:gravity="bottom"
android:layout_height="wrap_content"
android:layout_marginBottom="-1dip"
android:layout_marginTop="-1dip"
android:layout_marginBottom="-1dp"
android:layout_marginTop="-1dp"
android:layout_width="wrap_content"
android:textColor="@color/stat_label_text" />
</LinearLayout>
@@ -269,8 +270,8 @@ limitations under the License.
android:id="@+id/moving_time_register"
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="fill_parent"
android:layout_span="2"
android:text="@string/value_unknown"
@@ -279,16 +280,16 @@ limitations under the License.
<TextView
android:background="@color/black"
android:layout_column="3"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_width="5dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="5dp"
android:textSize="40sp" />
<TextView
android:gravity="right"
android:id="@+id/average_moving_speed_register"
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -302,20 +303,20 @@ limitations under the License.
android:id="@+id/average_moving_speed_unit_label_top"
android:gravity="bottom"
android:layout_height="wrap_content"
android:layout_marginBottom="-1dip"
android:layout_marginTop="-1dip"
android:layout_marginBottom="-1dp"
android:layout_marginTop="-1dp"
android:layout_width="wrap_content"
android:textColor="@color/stat_label_text" />
<TextView
android:background="@color/black"
android:layout_height="3dip"
android:layout_height="3dp"
android:layout_width="fill_parent" />
<TextView
android:id="@+id/average_moving_speed_unit_label_bottom"
android:gravity="bottom"
android:layout_height="wrap_content"
android:layout_marginBottom="-1dip"
android:layout_marginTop="-1dip"
android:layout_marginBottom="-1dp"
android:layout_marginTop="-1dp"
android:layout_width="wrap_content"
android:textColor="@color/stat_label_text" />
</LinearLayout>
@@ -340,8 +341,8 @@ limitations under the License.
android:gravity="right"
android:id="@+id/elevation_register"
android:layout_column="1"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -349,23 +350,23 @@ limitations under the License.
android:gravity="left"
android:id="@+id/elevation_unit_label"
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text"/>
<TextView
android:background="@color/black"
android:layout_column="3"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_width="5dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="5dp"
android:textSize="40sp" />
<TextView
android:gravity="right"
android:id="@+id/elevation_gain_register"
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -373,8 +374,8 @@ limitations under the License.
android:gravity="left"
android:id="@+id/elevation_gain_unit_label"
android:layout_column="5"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
</TableRow>
@@ -398,8 +399,8 @@ limitations under the License.
android:gravity="right"
android:id="@+id/min_elevation_register"
android:layout_column="1"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -407,23 +408,23 @@ limitations under the License.
android:gravity="left"
android:id="@+id/min_elevation_unit_label"
android:layout_column="2"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
<TextView
android:background="@color/black"
android:layout_column="3"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_width="5dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="5dp"
android:textSize="40sp" />
<TextView
android:gravity="right"
android:id="@+id/max_elevation_register"
android:layout_column="4"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/value_unknown"
android:textColor="@color/stat_label_text"
android:textSize="40sp" />
@@ -431,8 +432,8 @@ limitations under the License.
android:id="@+id/max_elevation_unit_label"
android:gravity="left"
android:layout_column="5"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:text="@string/unit_feet"
android:textColor="@color/stat_label_text" />
</TableRow>
@@ -457,8 +458,8 @@ limitations under the License.
android:id="@+id/min_grade_register"
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="fill_parent"
android:layout_span="2"
android:text="@string/value_unknown"
@@ -467,17 +468,17 @@ limitations under the License.
<TextView
android:background="@color/black"
android:layout_column="3"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_width="5dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="5dp"
android:textSize="40sp" />
<TextView
android:gravity="right"
android:id="@+id/max_grade_register"
android:layout_column="4"
android:layout_height="wrap_content"
android:layout_marginBottom="-9dip"
android:layout_marginTop="-9dip"
android:layout_marginBottom="-9dp"
android:layout_marginTop="-9dp"
android:layout_width="fill_parent"
android:layout_span="2"
android:text="@string/value_unknown"
MyTracks/res/layout/mytracks_waypoints_list.xml
+4 -4
View File
@@ -26,14 +26,14 @@ limitations under the License.
android:layout_height="wrap_content"
android:background="@drawable/list_bar"
android:layout_weight="0"
android:padding="3dip">
android:padding="3dp">
<TextView android:id="@+id/message"
android:layout_width="fill_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="16dip"
android:textSize="16dp"
android:textColor="#fff"
android:text="@string/marker_list_pick_one"
android:layout_weight="0"/>
android:layout_weight="1"/>
</LinearLayout>
<ListView android:id="@android:id/list"
MyTracks/res/layout/search_list.xml
+1 -1
View File
@@ -28,7 +28,7 @@ limitations under the License.
android:layout_width="fill_parent"
android:text="@string/search_no_results"
android:textColor="@android:color/white"
android:textSize="20dip"
android:textSize="20dp"
android:textStyle="bold"
android:visibility="gone" />
</LinearLayout>
MyTracks/res/layout/stats.xml
+8 -9
View File
@@ -68,7 +68,7 @@ limitations under the License.
<!-- Total distance and max speed -->
<TableRow
android:padding="1dip">
android:padding="1dp">
<TextView
android:id="@+id/total_distance_label"
android:layout_column="1"
@@ -204,7 +204,7 @@ limitations under the License.
style="@style/StatsUnit" />
<TextView
style="@style/StatsDivider" />
android:layout_height="3dip"
android:layout_height="3dp"
android:layout_width="fill_parent" />
<TextView
android:id="@+id/average_moving_speed_unit_label_bottom"
@@ -349,17 +349,16 @@ limitations under the License.
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="0"
android:padding="3dip"
android:padding="3dp"
android:visibility="gone">
<ProgressBar
android:layout_weight="1"
android:layout_height="0dip"
android:layout_height="0dp"
android:layout_width="wrap_content"
android:maxWidth="80dip"
android:maxHeight="80dip"
android:minWidth="80dip"
android:minHeight="80dip"
android:maxWidth="80dp"
android:maxHeight="80dp"
android:minWidth="80dp"
android:minHeight="80dp"
android:layout_gravity="center"/>
</LinearLayout>
</RelativeLayout>
MyTracks/res/layout/track_detail.xml
+1
View File
@@ -43,6 +43,7 @@ limitations under the License.
android:orientation="horizontal"
>
<ImageView
android:contentDescription="@string/track_icon_description"
android:layout_gravity="center"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
MyTracks/res/layout/track_widget.xml
+11 -11
View File
@@ -19,10 +19,10 @@ limitations under the License.
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingLeft="10px"
android:paddingRight="10px"
android:paddingTop="5px"
android:paddingBottom="5px">
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp">
<LinearLayout
android:layout_height="fill_parent"
android:layout_width="fill_parent"
@@ -32,17 +32,17 @@ limitations under the License.
android:layout_height="fill_parent"
android:layout_width="wrap_content"
android:background="@android:color/transparent"
android:paddingLeft="10px"
android:paddingRight="10px"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:src="@drawable/appwidget_button_disabled" />
<LinearLayout
android:id="@+id/appwidget_track_statistics"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:clickable="true"
android:orientation="vertical"
android:paddingLeft="15px">
android:paddingLeft="15dp">
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
@@ -56,13 +56,13 @@ limitations under the License.
</LinearLayout>
<ImageView
android:layout_width="fill_parent"
android:layout_height="1px"
android:layout_height="1dp"
android:background="@color/appwidget_hr" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal"
android:paddingBottom="2px">
android:paddingBottom="2dp">
<TextView
style="@style/WidgetTextView.Value"
android:id="@+id/appwidget_time_text" />
@@ -72,7 +72,7 @@ limitations under the License.
</LinearLayout>
<ImageView
android:layout_width="fill_parent"
android:layout_height="1px"
android:layout_height="1dp"
android:background="@color/appwidget_hr" />
<LinearLayout
android:layout_height="wrap_content"
MyTracks/res/layout/upload_service_chooser.xml
+3
View File
@@ -39,6 +39,7 @@ limitations under the License.
<!-- Google Maps -->
<TableRow android:id="@+id/send_google_maps_row">
<ImageView
android:contentDescription="@string/send_google_maps"
android:src="@drawable/maps_icon"
style="@style/SendGoogleImageView"/>
<CheckBox
@@ -66,6 +67,7 @@ limitations under the License.
<!-- Google Fusion Tables -->
<TableRow android:id="@+id/send_google_fusion_tables_row">
<ImageView
android:contentDescription="@string/send_google_fusion_tables"
android:src="@drawable/googledocs_icon"
style="@style/SendGoogleImageView"/>
<CheckBox
@@ -77,6 +79,7 @@ limitations under the License.
<!-- Google Docs -->
<TableRow android:id="@+id/send_google_docs_row">
<ImageView
android:contentDescription="@string/send_google_docs"
android:src="@drawable/googledocs_icon"
style="@style/SendGoogleImageView"/>
<CheckBox
MyTracks/res/layout/welcome.xml
+1
View File
@@ -29,6 +29,7 @@ limitations under the License.
android:layout_width="fill_parent"
android:orientation="vertical">
<ImageView
android:contentDescription="@string/my_tracks_app_name"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:scaleType="fitStart"
MyTracks/res/values/colors.xml
-4
View File
@@ -17,11 +17,7 @@ limitations under the License.
<resources>
<color name="black">#FF000000</color>
<color name="blue">#FF0000FF</color>
<color name="darkgray">#FF444444</color>
<color name="gold">#FFffd700</color>
<color name="gray">#FFAAAAAA</color>
<color name="lightblue">#FF00FFFF</color>
<color name="opaque_shadow">#70000000</color>
<color name="red">#FFFF0000</color>
<color name="stat_label_background">#FFF0F0F0</color>
<color name="stat_label_text">#FF0F0F0F</color>
MyTracks/res/values/strings.xml
+8 -8
View File
@@ -921,6 +921,10 @@ limitations under the License.
Screenshot: marker_detail.png">
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.">
@@ -975,10 +979,6 @@ limitations under the License.
Screenshot: marker_list_context_menu.png">
Edit
</string>
<string name="marker_list_icon_description"
translation_description="In the Markers page, the accessibility description for the marker icon.">
Marker
</string>
<string name="marker_list_insert_statistics"
translation_description="In the Markers page, the button on the bottom to insert a statistics
marker.
@@ -2351,6 +2351,10 @@ limitations under the License.
Screenshot: track_detail.png">
Track name
</string>
<string name="track_icon_description"
translation_description="The accessibility description for the track icon.">
Track
</string>
<string name="track_list_clear_map"
translation_description="In the context menu for a track, the menu option to clear the map of
any track.
@@ -2494,10 +2498,6 @@ limitations under the License.
Screenshot: track_list_show_on_map.png">
Show on map
</string>
<string name="track_list_icon_description"
translation_description="In the 'Tracks' page, the accessibility description for the track icon.">
Track
</string>
<string name="track_list_track_name"
translation_description="In the 'Search Result' page, the text field indicating the track that a
waypoint belongs to.
MyTracks/res/values/styles.xml
+14 -28
View File
@@ -74,25 +74,11 @@ limitations under the License.
<item name="android:visibility">gone</item>
</style>
<!-- Chart settings axis image -->
<style name="ChartSettingsAxisImage">
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_width">wrap_content</item>
</style>
<!-- Chart settings axis layout -->
<style name="ChartSettingsAxisLayout">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:orientation">horizontal</item>
</style>
<!-- Chart settings axis text -->
<style name="ChartSettingsAxisText">
<item name="android:gravity">bottom</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:paddingLeft">10dp</item>
<item name="android:textSize">20sp</item>
</style>
@@ -152,15 +138,15 @@ limitations under the License.
<!-- The style for a view which divides the numerator and denominator of the units on the statistics activity. -->
<style name="StatsDivider" parent="@android:Widget.TextView">
<item name="android:background">@color/black</item>
<item name="android:layout_height">3dip</item>
<item name="android:layout_height">3dp</item>
<item name="android:layout_width">fill_parent</item>
</style>
<!-- The style for a text view for displaying a value on the statistics activity. -->
<style name="StatsRegister" parent="@android:Widget.TextView">
<item name="android:gravity">right</item>
<item name="android:layout_marginBottom">-9dip</item>
<item name="android:layout_marginTop">-9dip</item>
<item name="android:layout_marginBottom">-9dp</item>
<item name="android:layout_marginTop">-9dp</item>
<item name="android:text">@string/value_unknown</item>
<item name="android:textColor">@color/stat_label_text</item>
<item name="android:textSize">40sp</item>
@@ -168,16 +154,16 @@ limitations under the License.
<!-- The style for a text view for displaying a large value on the statistics activity. -->
<style name="StatsRegister.Big">
<item name="android:layout_marginBottom">-13dip</item>
<item name="android:layout_marginTop">-13dip</item>
<item name="android:layout_marginBottom">-13dp</item>
<item name="android:layout_marginTop">-13dp</item>
<item name="android:textSize">50sp</item>
</style>
<!-- The style for a text view for displaying a small value on the statistics activity. -->
<style name="StatsRegister.Small">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">-5dip</item>
<item name="android:layout_marginTop">-5dip</item>
<item name="android:layout_marginBottom">-5dp</item>
<item name="android:layout_marginTop">-5dp</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:textSize">25sp</item>
</style>
@@ -185,9 +171,9 @@ limitations under the License.
<!-- The style for a view which divides two columns in the statistics activity. -->
<style name="StatsSpacer" parent="@android:Widget.TextView">
<item name="android:background">@color/black</item>
<item name="android:layout_marginBottom">-9dip</item>
<item name="android:layout_marginTop">-9dip</item>
<item name="android:layout_width">5dip</item>
<item name="android:layout_marginBottom">-9dp</item>
<item name="android:layout_marginTop">-9dp</item>
<item name="android:layout_width">5dp</item>
<item name="android:textSize">40sp</item>
</style>
@@ -195,8 +181,8 @@ limitations under the License.
<style name="StatsUnit" parent="@android:Widget.TextView">
<item name="android:gravity">bottom</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">-2dip</item>
<item name="android:layout_marginTop">-2dip</item>
<item name="android:layout_marginBottom">-2dp</item>
<item name="android:layout_marginTop">-2dp</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:textColor">@color/stat_label_text</item>
</style>
@@ -204,8 +190,8 @@ limitations under the License.
<!-- The style for the unit on the statistics activity where there is only one string. -->
<style name="StatsUnitSolo" parent="@android:Widget.TextView">
<item name="android:gravity">right</item>
<item name="android:layout_marginBottom">-9dip</item>
<item name="android:layout_marginTop">-9dip</item>
<item name="android:layout_marginBottom">-9dp</item>
<item name="android:layout_marginTop">-9dp</item>
<item name="android:textColor">@color/stat_label_text</item>
</style>
MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java
+15 -7
View File
@@ -425,18 +425,26 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask {
}
boolean isSuccess = response.isSuccessStatusCode();
if (isSuccess) {
InputStream content;
InputStream content = null;
try {
content = response.getContent();
if (setTableId) {
tableId = SendFusionTablesUtils.getTableId(content);
if (tableId == null) {
Log.d(TAG, "tableId is null");
return false;
}
}
} catch (IOException e) {
Log.d(TAG, "Unable to get response", e);
return false;
}
if (setTableId) {
tableId = SendFusionTablesUtils.getTableId(content);
if (tableId == null) {
Log.d(TAG, "tableId is null");
return false;
} finally {
if (content != null) {
try {
content.close();
} catch (IOException e) {
Log.d(TAG, "Unable to close content", e);
}
}
}
} else {
MyTracks/src/com/google/android/apps/mytracks/io/gdata/maps/MapsGDataConverter.java
-1
View File
@@ -169,7 +169,6 @@ public class MapsGDataConverter {
xmlSerializer.endTag(null, "Placemark");
xmlSerializer.flush();
entry.setContent(writer.toString());
Log.d("My Google Maps", "Generated kml:\n" + entry.getContent());
Log.d("My Google Maps", "Edit URI: " + entry.getEditUri());
} catch (IOException e) {
e.printStackTrace();
MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTask.java
+7 -16
View File
@@ -118,17 +118,17 @@ public class ChooseMapAsyncTask extends AsyncTask<Void, Integer, Boolean> {
@Override
protected Boolean doInBackground(Void... params) {
return getMaps();
}
@Override
protected void onCancelled() {
closeClient();
try {
return getMaps();
} finally {
if (gDataClient != null) {
gDataClient.close();
}
}
}
@Override
protected void onPostExecute(Boolean result) {
closeClient();
success = result;
completed = true;
if (activity != null) {
@@ -136,15 +136,6 @@ public class ChooseMapAsyncTask extends AsyncTask<Void, Integer, Boolean> {
}
}
/**
* Closes the gdata client.
*/
private void closeClient() {
if (gDataClient != null) {
gDataClient.close();
}
}
/**
* Gets all the maps from Google Maps.
*
MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AbstractSendAsyncTask.java
+8 -10
View File
@@ -76,7 +76,14 @@ public abstract class AbstractSendAsyncTask extends AsyncTask<Void, Integer, Boo
@Override
protected Boolean doInBackground(Void... params) {
return performTask();
try {
return performTask();
} finally {
closeConnection();
if (success) {
saveResult();
}
}
}
@Override
@@ -89,21 +96,12 @@ public abstract class AbstractSendAsyncTask extends AsyncTask<Void, Integer, Boo
@Override
protected void onPostExecute(Boolean result) {
success = result;
if (success) {
saveResult();
}
completed = true;
closeConnection();
if (activity != null) {
activity.onAsyncTaskCompleted(success);
}
}
@Override
protected void onCancelled() {
closeConnection();
}
/**
* Retries the task. First, invalidates the auth token. If can retry, invokes
* {@link #performTask()}. Returns false if cannot retry.